From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Tue, 13 Nov 2018 14:14:15 +0000 (+0100)
Subject: update string-edit.
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=9e2ee12467b0ca7a242850bd226b16bb0a2b8532;p=emacsconfig.git

update string-edit.

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---

diff --git a/elpa/string-edit-20151213.930/string-edit-autoloads.el b/elpa/string-edit-20151213.930/string-edit-autoloads.el
deleted file mode 100644
index 531d69cf..00000000
--- a/elpa/string-edit-20151213.930/string-edit-autoloads.el
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; string-edit-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
-
-;;;### (autoloads nil "string-edit" "string-edit.el" (22137 14978
-;;;;;;  0 0))
-;;; Generated autoloads from string-edit.el
-
-(autoload 'string-edit-at-point "string-edit" "\
-
-
-\(fn)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; string-edit-autoloads.el ends here
diff --git a/elpa/string-edit-20151213.930/string-edit-pkg.el b/elpa/string-edit-20151213.930/string-edit-pkg.el
deleted file mode 100644
index d6bf1855..00000000
--- a/elpa/string-edit-20151213.930/string-edit-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "string-edit" "20151213.930" "Avoid escape nightmares by editing string in separate buffer" '((dash "1.2.0")))
diff --git a/elpa/string-edit-20151213.930/string-edit.el b/elpa/string-edit-20151213.930/string-edit.el
deleted file mode 100644
index dee270b2..00000000
--- a/elpa/string-edit-20151213.930/string-edit.el
+++ /dev/null
@@ -1,260 +0,0 @@
-;;; string-edit.el --- Avoid escape nightmares by editing string in separate buffer
-
-;; Copyright (C) 2013 Magnar Sveen
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 0.1.0
-;; Package-Version: 20151213.930
-;; Package-Requires: ((dash "1.2.0"))
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Avoid escape nightmares by editing string in separate buffer
-
-;;; Code:
-
-(require 'dash)
-
-(defvar se/original)
-(defvar se/original-buffer)
-
-(defvar string-edit-at-point-hook ()
-  "Hook to run just before enabling `string-edit-mode'.
-This hook provides an opportunity to enable a custom major mode
-before the minor mode is enabled.")
-
-;;;###autoload
-(defun string-edit-at-point ()
-  (interactive)
-  (when (se/point-inside-string-p)
-    (let* ((p (point))
-           (original-buffer (current-buffer))
-           (original (se/find-original)))
-      (select-window (split-window-vertically -4))
-      (switch-to-buffer (generate-new-buffer "*string-edit*"))
-      (insert (se/aget :raw original))
-      (goto-char (- p (se/aget :beg original) -1))
-      (funcall (se/aget :cleanup original))
-      (enlarge-window (1- (line-number-at-pos (point-max))))
-      (se/guess-at-major-mode)
-      (run-hooks 'string-edit-at-point-hook)
-      (string-edit-mode 1)
-      (set (make-local-variable 'se/original) original)
-      (set (make-local-variable 'se/original-buffer) original-buffer)
-      (font-lock-fontify-buffer))))
-
-(defun string-edit-abort ()
-  "Used in string-edit-mode to close the popup window"
-  (interactive)
-  (kill-buffer)
-  (delete-window))
-
-(defun string-edit-conclude ()
-  (interactive)
-  (funcall (se/aget :escape se/original))
-  (let ((p (point))
-        (contents (buffer-substring-no-properties (point-min) (point-max)))
-        (original se/original)
-        (original-buffer se/original-buffer)
-        (beg (se/aget :beg se/original)))
-    (kill-buffer)
-    (delete-window)
-    (switch-to-buffer original-buffer)
-    (goto-char beg)
-    (delete-char (length (se/aget :raw original)))
-    (insert "\"" contents "\"")
-    (let ((end (point)))
-      (goto-char (+ p beg))
-      (indent-region beg end))))
-
-(defun se/find-original ()
-  (if (derived-mode-p 'js2-mode 'js-mode)
-      (se/js-strings-at-point)
-    (se/string-at-point)))
-
-(defun se/guess-at-major-mode ()
-  (save-excursion
-    (goto-char (point-min))
-    (when (looking-at "<")
-      (html-mode))))
-
-(defun se/unescape (quote)
-  (goto-char (point-min))
-  (while (search-forward (concat "\\" quote) nil t)
-    (replace-match "")
-    (insert quote)))
-
-(defun se/escape (quote)
-  (goto-char (point-min))
-  (while (search-forward quote nil t)
-    (replace-match "")
-    (insert "\\" quote)))
-
-(defun se/unescape-ws (signifier char)
-  (goto-char (point-min))
-  (while (search-forward (concat "\\" signifier) nil t)
-    (replace-match "")
-    (insert char)))
-
-(defun se/escape-ws (signifier char)
-  (goto-char (point-min))
-  (while (search-forward char nil t)
-    (replace-match "")
-    (insert "\\" signifier)))
-
-(defvar string-edit-mode-map nil
-  "Keymap for string-edit minor mode.")
-
-(unless string-edit-mode-map
-  (setq string-edit-mode-map (make-sparse-keymap)))
-
-(--each '(("C-c C-k" . string-edit-abort)
-          ("C-c C-c" . string-edit-conclude))
-  (define-key string-edit-mode-map (read-kbd-macro (car it)) (cdr it)))
-
-(define-minor-mode string-edit-mode
-  "Minor mode for useful keybindings while editing string."
-  nil " StringEdit" string-edit-mode-map
-  (if string-edit-mode-map
-      (add-hook 'post-command-hook 'se/post-command nil t)
-    (remove-hook 'post-command-hook 'se/post-command t)))
-
-(defun se/post-command ()
-  (se/adjust-window-size-to-fit-text))
-
-(defun se/adjust-window-size-to-fit-text ()
-  (when (and (> (+ 2 (line-number-at-pos (point-max)))
-                (window-height))
-             (> (/ (frame-height) (window-height))
-                1))
-    (enlarge-window 1)))
-
-(defun se/aget (key map)
-  (cdr (assoc key map)))
-
-(defun se/current-quotes-char ()
-  "The char that is the current quote delimiter, or nil if not in a string."
-  (let ((delimiter (nth 3 (syntax-ppss))))
-    (cond ((stringp delimiter) delimiter)
-          ;; `syntax-ppss' can return t meaning 'a generic string delimiter'.
-          (delimiter ?\"))))
-
-(defalias 'se/point-inside-string-p 'se/current-quotes-char)
-
-(defun se/move-point-backward-out-of-string ()
-  "Move point backward until it exits the current quoted string."
-  (while (se/point-inside-string-p) (backward-char)))
-
-(defun se/move-point-forward-out-of-string ()
-  "Move point forward until it exits the current quoted string."
-  (while (se/point-inside-string-p) (forward-char)))
-
-(defun se/string-position-at-point ()
-  (let (beg)
-    (save-excursion
-      (se/move-point-backward-out-of-string)
-      (setq beg (point))
-      (forward-sexp 1)
-      (cons beg (point)))))
-
-;;; String conversion types
-
-;; Regular old strings
-
-(defun se/string-at-point ()
-  (let* ((pos (se/string-position-at-point))
-         (p (point))
-         (beg (car pos))
-         (end (cdr pos))
-         (raw (buffer-substring-no-properties beg end))
-         (quote (char-to-string (se/current-quotes-char))))
-    `((:beg . ,beg)
-      (:end . ,end)
-      (:raw . ,raw)
-      (:cleanup . ,(-partial 'se/string-at-point/clean-up quote))
-      (:escape . ,(-partial 'se/string-at-point/escape quote)))))
-
-(defun se/string-at-point/clean-up (quote)
-  (save-excursion
-    (goto-char (point-max))
-    (delete-char (- (length quote)))
-    (goto-char (point-min))
-    (delete-char (length quote))
-    (se/unescape quote)
-    (se/unescape-ws "n" "\n")
-    (se/unescape-ws "r" "\r")
-    (se/unescape-ws "t" "\t")
-    (se/unescape "\\")))
-
-(defun se/string-at-point/escape (quote)
-  (save-excursion
-    (se/escape "\\")
-    (se/escape-ws "n" "\n")
-    (se/escape-ws "r" "\r")
-    (se/escape-ws "t" "\t")
-    (se/escape quote)))
-
-;; JavaScript strings, can be concatenated
-
-(defun se/js-strings-at-point ()
-  (let ((quote (char-to-string (se/current-quotes-char)))
-        beg end)
-    (save-excursion
-      (se/move-point-backward-out-of-string)
-      (while (looking-back (concat (regexp-quote quote) "[\n\r\t ]*\\+[\n ]*"))
-        (goto-char (match-beginning 0))
-        (se/move-point-backward-out-of-string))
-      (setq beg (point)))
-    (save-excursion
-      (se/move-point-forward-out-of-string)
-      (while (looking-at (concat "[\n ]*\\+[\n ]*" (regexp-quote quote)))
-        (goto-char (match-end 0))
-        (se/move-point-forward-out-of-string))
-      (setq end (point)))
-    `((:beg . ,beg)
-      (:end . ,end)
-      (:raw . ,(buffer-substring-no-properties beg end))
-      (:cleanup . ,(-partial 'se/js-strings-at-point/clean-up quote))
-      (:escape . ,(-partial 'se/js-strings-at-point/escape quote)))))
-
-(defun se/js-strings-at-point/clean-up (quote)
-  (save-excursion
-    (goto-char (point-max))
-    (delete-char (- (length quote)))
-    (goto-char (point-min))
-    (delete-char (length quote))
-    (while (search-forward (concat quote " + " quote) nil t)
-      (replace-match ""))
-    (goto-char (point-min))
-    (while (re-search-forward (concat (regexp-quote quote) " \\+ *\n *" (regexp-quote quote)) nil t)
-      (replace-match "\n"))
-    (se/unescape quote)
-    (se/unescape "\\")))
-
-(defun se/js-strings-at-point/escape (quote)
-  (save-excursion
-    (se/escape "\\")
-    (se/escape quote)
-    (goto-char (point-min))
-    (while (re-search-forward "^" nil t)
-      (unless (bobp)
-        (insert "\""))
-      (end-of-line)
-      (unless (eobp)
-        (insert "\" +")))))
-
-(provide 'string-edit)
-;;; string-edit.el ends here
diff --git a/elpa/string-edit-20160411.656/string-edit-autoloads.el b/elpa/string-edit-20160411.656/string-edit-autoloads.el
new file mode 100644
index 00000000..fe6540ba
--- /dev/null
+++ b/elpa/string-edit-20160411.656/string-edit-autoloads.el
@@ -0,0 +1,28 @@
+;;; string-edit-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+(add-to-list 'load-path (directory-file-name
+                         (or (file-name-directory #$) (car load-path))))
+
+
+;;;### (autoloads nil "string-edit" "string-edit.el" (0 0 0 0))
+;;; Generated autoloads from string-edit.el
+
+(autoload 'string-edit-at-point "string-edit" "\
+Pop up a buffer to edit the string at point.
+This saves you from needing to manually escape characters.
+
+\(fn)" t nil)
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "string-edit" '("string-edit-" "se/")))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; string-edit-autoloads.el ends here
diff --git a/elpa/string-edit-20160411.656/string-edit-pkg.el b/elpa/string-edit-20160411.656/string-edit-pkg.el
new file mode 100644
index 00000000..f25806c7
--- /dev/null
+++ b/elpa/string-edit-20160411.656/string-edit-pkg.el
@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "string-edit" "20160411.656" "Avoid escape nightmares by editing string in separate buffer" '((dash "1.2.0")) :commit "c44b65b4c5e9f52be9c14d88ca2f402a18d9e1dd" :authors '(("Magnar Sveen" . "magnars@gmail.com")) :maintainer '("Magnar Sveen" . "magnars@gmail.com"))
diff --git a/elpa/string-edit-20160411.656/string-edit.el b/elpa/string-edit-20160411.656/string-edit.el
new file mode 100644
index 00000000..85c16346
--- /dev/null
+++ b/elpa/string-edit-20160411.656/string-edit.el
@@ -0,0 +1,262 @@
+;;; string-edit.el --- Avoid escape nightmares by editing string in separate buffer
+
+;; Copyright (C) 2013 Magnar Sveen
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 0.1.0
+;; Package-Version: 20160411.656
+;; Package-Requires: ((dash "1.2.0"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Avoid escape nightmares by editing string in separate buffer
+
+;;; Code:
+
+(require 'dash)
+
+(defvar se/original)
+(defvar se/original-buffer)
+
+(defvar string-edit-at-point-hook ()
+  "Hook to run just before enabling `string-edit-mode'.
+This hook provides an opportunity to enable a custom major mode
+before the minor mode is enabled.")
+
+;;;###autoload
+(defun string-edit-at-point ()
+  "Pop up a buffer to edit the string at point.
+This saves you from needing to manually escape characters."
+  (interactive)
+  (when (se/point-inside-string-p)
+    (let* ((p (point))
+           (original-buffer (current-buffer))
+           (original (se/find-original)))
+      (select-window (split-window-vertically -4))
+      (switch-to-buffer (generate-new-buffer "*string-edit*"))
+      (insert (se/aget :raw original))
+      (goto-char (- p (se/aget :beg original) -1))
+      (funcall (se/aget :cleanup original))
+      (enlarge-window (1- (line-number-at-pos (point-max))))
+      (se/guess-at-major-mode)
+      (run-hooks 'string-edit-at-point-hook)
+      (string-edit-mode 1)
+      (set (make-local-variable 'se/original) original)
+      (set (make-local-variable 'se/original-buffer) original-buffer)
+      (font-lock-fontify-buffer))))
+
+(defun string-edit-abort ()
+  "Used in string-edit-mode to close the popup window"
+  (interactive)
+  (kill-buffer)
+  (delete-window))
+
+(defun string-edit-conclude ()
+  (interactive)
+  (funcall (se/aget :escape se/original))
+  (let ((p (point))
+        (contents (buffer-substring-no-properties (point-min) (point-max)))
+        (original se/original)
+        (original-buffer se/original-buffer)
+        (beg (se/aget :beg se/original)))
+    (kill-buffer)
+    (delete-window)
+    (switch-to-buffer original-buffer)
+    (goto-char beg)
+    (delete-char (length (se/aget :raw original)))
+    (insert "\"" contents "\"")
+    (let ((end (point)))
+      (goto-char (+ p beg))
+      (indent-region beg end))))
+
+(defun se/find-original ()
+  (if (derived-mode-p 'js2-mode 'js-mode)
+      (se/js-strings-at-point)
+    (se/string-at-point)))
+
+(defun se/guess-at-major-mode ()
+  (save-excursion
+    (goto-char (point-min))
+    (when (looking-at "<")
+      (html-mode))))
+
+(defun se/unescape (quote)
+  (goto-char (point-min))
+  (while (search-forward (concat "\\" quote) nil t)
+    (replace-match "")
+    (insert quote)))
+
+(defun se/escape (quote)
+  (goto-char (point-min))
+  (while (search-forward quote nil t)
+    (replace-match "")
+    (insert "\\" quote)))
+
+(defun se/unescape-ws (signifier char)
+  (goto-char (point-min))
+  (while (search-forward (concat "\\" signifier) nil t)
+    (replace-match "")
+    (insert char)))
+
+(defun se/escape-ws (signifier char)
+  (goto-char (point-min))
+  (while (search-forward char nil t)
+    (replace-match "")
+    (insert "\\" signifier)))
+
+(defvar string-edit-mode-map nil
+  "Keymap for string-edit minor mode.")
+
+(unless string-edit-mode-map
+  (setq string-edit-mode-map (make-sparse-keymap)))
+
+(--each '(("C-c C-k" . string-edit-abort)
+          ("C-c C-c" . string-edit-conclude))
+  (define-key string-edit-mode-map (read-kbd-macro (car it)) (cdr it)))
+
+(define-minor-mode string-edit-mode
+  "Minor mode for useful keybindings while editing string."
+  nil " StringEdit" string-edit-mode-map
+  (if string-edit-mode-map
+      (add-hook 'post-command-hook 'se/post-command nil t)
+    (remove-hook 'post-command-hook 'se/post-command t)))
+
+(defun se/post-command ()
+  (se/adjust-window-size-to-fit-text))
+
+(defun se/adjust-window-size-to-fit-text ()
+  (when (and (> (+ 2 (line-number-at-pos (point-max)))
+                (window-height))
+             (> (/ (frame-height) (window-height))
+                1))
+    (enlarge-window 1)))
+
+(defun se/aget (key map)
+  (cdr (assoc key map)))
+
+(defun se/current-quotes-char ()
+  "The char that is the current quote delimiter, or nil if not in a string."
+  (let ((delimiter (nth 3 (syntax-ppss))))
+    (cond ((stringp delimiter) delimiter)
+          ;; `syntax-ppss' can return t meaning 'a generic string delimiter'.
+          (delimiter ?\"))))
+
+(defalias 'se/point-inside-string-p 'se/current-quotes-char)
+
+(defun se/move-point-backward-out-of-string ()
+  "Move point backward until it exits the current quoted string."
+  (while (se/point-inside-string-p) (backward-char)))
+
+(defun se/move-point-forward-out-of-string ()
+  "Move point forward until it exits the current quoted string."
+  (while (se/point-inside-string-p) (forward-char)))
+
+(defun se/string-position-at-point ()
+  (let (beg)
+    (save-excursion
+      (se/move-point-backward-out-of-string)
+      (setq beg (point))
+      (forward-sexp 1)
+      (cons beg (point)))))
+
+;;; String conversion types
+
+;; Regular old strings
+
+(defun se/string-at-point ()
+  (let* ((pos (se/string-position-at-point))
+         (p (point))
+         (beg (car pos))
+         (end (cdr pos))
+         (raw (buffer-substring-no-properties beg end))
+         (quote (char-to-string (se/current-quotes-char))))
+    `((:beg . ,beg)
+      (:end . ,end)
+      (:raw . ,raw)
+      (:cleanup . ,(-partial 'se/string-at-point/clean-up quote))
+      (:escape . ,(-partial 'se/string-at-point/escape quote)))))
+
+(defun se/string-at-point/clean-up (quote)
+  (save-excursion
+    (goto-char (point-max))
+    (delete-char (- (length quote)))
+    (goto-char (point-min))
+    (delete-char (length quote))
+    (se/unescape quote)
+    (se/unescape-ws "n" "\n")
+    (se/unescape-ws "r" "\r")
+    (se/unescape-ws "t" "\t")
+    (se/unescape "\\")))
+
+(defun se/string-at-point/escape (quote)
+  (save-excursion
+    (se/escape "\\")
+    (se/escape-ws "n" "\n")
+    (se/escape-ws "r" "\r")
+    (se/escape-ws "t" "\t")
+    (se/escape quote)))
+
+;; JavaScript strings, can be concatenated
+
+(defun se/js-strings-at-point ()
+  (let ((quote (char-to-string (se/current-quotes-char)))
+        beg end)
+    (save-excursion
+      (se/move-point-backward-out-of-string)
+      (while (looking-back (concat (regexp-quote quote) "[\n\r\t ]*\\+[\n ]*"))
+        (goto-char (match-beginning 0))
+        (se/move-point-backward-out-of-string))
+      (setq beg (point)))
+    (save-excursion
+      (se/move-point-forward-out-of-string)
+      (while (looking-at (concat "[\n ]*\\+[\n ]*" (regexp-quote quote)))
+        (goto-char (match-end 0))
+        (se/move-point-forward-out-of-string))
+      (setq end (point)))
+    `((:beg . ,beg)
+      (:end . ,end)
+      (:raw . ,(buffer-substring-no-properties beg end))
+      (:cleanup . ,(-partial 'se/js-strings-at-point/clean-up quote))
+      (:escape . ,(-partial 'se/js-strings-at-point/escape quote)))))
+
+(defun se/js-strings-at-point/clean-up (quote)
+  (save-excursion
+    (goto-char (point-max))
+    (delete-char (- (length quote)))
+    (goto-char (point-min))
+    (delete-char (length quote))
+    (while (search-forward (concat quote " + " quote) nil t)
+      (replace-match ""))
+    (goto-char (point-min))
+    (while (re-search-forward (concat (regexp-quote quote) " \\+ *\n *" (regexp-quote quote)) nil t)
+      (replace-match "\n"))
+    (se/unescape quote)
+    (se/unescape "\\")))
+
+(defun se/js-strings-at-point/escape (quote)
+  (save-excursion
+    (se/escape "\\")
+    (se/escape quote)
+    (goto-char (point-min))
+    (while (re-search-forward "^" nil t)
+      (unless (bobp)
+        (insert "\""))
+      (end-of-line)
+      (unless (eobp)
+        (insert "\" +")))))
+
+(provide 'string-edit)
+;;; string-edit.el ends here