aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/wid-edit.el46
1 files changed, 23 insertions, 23 deletions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index d861429e212..8889fbb0488 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -275,7 +275,7 @@ minibuffer."
275 (while (not (or (and (>= char ?0) (< char next-digit)) 275 (while (not (or (and (>= char ?0) (< char next-digit))
276 (eq value 'keyboard-quit))) 276 (eq value 'keyboard-quit)))
277 ;; Unread a SPC to lead to our new menu. 277 ;; Unread a SPC to lead to our new menu.
278 (setq unread-command-events (cons ?\ unread-command-events)) 278 (setq unread-command-events (cons ?\s unread-command-events))
279 (setq keys (read-key-sequence title)) 279 (setq keys (read-key-sequence title))
280 (setq value 280 (setq value
281 (lookup-key overriding-terminal-local-map keys t) 281 (lookup-key overriding-terminal-local-map keys t)
@@ -377,7 +377,7 @@ new value.")
377 (end (widget-field-end field))) 377 (end (widget-field-end field)))
378 (when size 378 (when size
379 (while (and (> end begin) 379 (while (and (> end begin)
380 (eq (char-after (1- end)) ?\ )) 380 (eq (char-after (1- end)) ?\s))
381 (setq end (1- end)))) 381 (setq end (1- end))))
382 (while (< begin end) 382 (while (< begin end)
383 (let ((old (char-after begin))) 383 (let ((old (char-after begin)))
@@ -796,8 +796,8 @@ The optional ARGS are additional keyword arguments."
796 &optional button-from button-to 796 &optional button-from button-to
797 &rest args) 797 &rest args)
798 "Return a widget of type TYPE with endpoint FROM TO. 798 "Return a widget of type TYPE with endpoint FROM TO.
799Optional ARGS are extra keyword arguments for TYPE. 799No text will be inserted to the buffer, instead the text between FROM
800and TO will be used as the widgets end points. If optional arguments 800and TO will be used as the widgets end points. If optional arguments
801BUTTON-FROM and BUTTON-TO are given, these will be used as the widgets 801BUTTON-FROM and BUTTON-TO are given, these will be used as the widgets
802button end points. 802button end points.
803Optional ARGS are extra keyword arguments for TYPE." 803Optional ARGS are extra keyword arguments for TYPE."
@@ -1105,7 +1105,7 @@ the field."
1105 :group 'widgets) 1105 :group 'widgets)
1106 1106
1107(defun widget-narrow-to-field () 1107(defun widget-narrow-to-field ()
1108 "Narrow to field" 1108 "Narrow to field."
1109 (interactive) 1109 (interactive)
1110 (let ((field (widget-field-find (point)))) 1110 (let ((field (widget-field-find (point))))
1111 (if field 1111 (if field
@@ -1213,7 +1213,7 @@ When not inside a field, move to the previous button or field."
1213 1213
1214(defun widget-field-find (pos) 1214(defun widget-field-find (pos)
1215 "Return the field at POS. 1215 "Return the field at POS.
1216Unlike (get-char-property POS 'field) this, works with empty fields too." 1216Unlike (get-char-property POS 'field), this works with empty fields too."
1217 (let ((fields widget-field-list) 1217 (let ((fields widget-field-list)
1218 field found) 1218 field found)
1219 (while fields 1219 (while fields
@@ -1263,7 +1263,7 @@ Unlike (get-char-property POS 'field) this, works with empty fields too."
1263 ;; Field too small. 1263 ;; Field too small.
1264 (save-excursion 1264 (save-excursion
1265 (goto-char end) 1265 (goto-char end)
1266 (insert-char ?\ (- (+ begin size) end)))) 1266 (insert-char ?\s (- (+ begin size) end))))
1267 ((> (- end begin) size) 1267 ((> (- end begin) size)
1268 ;; Field too large and 1268 ;; Field too large and
1269 (if (or (< (point) (+ begin size)) 1269 (if (or (< (point) (+ begin size))
@@ -1274,7 +1274,7 @@ Unlike (get-char-property POS 'field) this, works with empty fields too."
1274 (setq begin (point))) 1274 (setq begin (point)))
1275 (save-excursion 1275 (save-excursion
1276 (goto-char end) 1276 (goto-char end)
1277 (while (and (eq (preceding-char) ?\ ) 1277 (while (and (eq (preceding-char) ?\s)
1278 (> (point) begin)) 1278 (> (point) begin))
1279 (delete-backward-char 1))))))) 1279 (delete-backward-char 1)))))))
1280 (widget-specify-secret field)) 1280 (widget-specify-secret field))
@@ -1434,7 +1434,7 @@ If that does not exists, call the value of `widget-complete-field'."
1434 ((eq escape ?n) 1434 ((eq escape ?n)
1435 (when (widget-get widget :indent) 1435 (when (widget-get widget :indent)
1436 (insert ?\n) 1436 (insert ?\n)
1437 (insert-char ? (widget-get widget :indent)))) 1437 (insert-char ?\s (widget-get widget :indent))))
1438 ((eq escape ?t) 1438 ((eq escape ?t)
1439 (let ((image (widget-get widget :tag-glyph)) 1439 (let ((image (widget-get widget :tag-glyph))
1440 (tag (widget-get widget :tag))) 1440 (tag (widget-get widget :tag)))
@@ -1498,7 +1498,7 @@ If that does not exists, call the value of `widget-complete-field'."
1498 (when doc-text 1498 (when doc-text
1499 (and (eq (preceding-char) ?\n) 1499 (and (eq (preceding-char) ?\n)
1500 (widget-get widget :indent) 1500 (widget-get widget :indent)
1501 (insert-char ? (widget-get widget :indent))) 1501 (insert-char ?\s (widget-get widget :indent)))
1502 ;; The `*' in the beginning is redundant. 1502 ;; The `*' in the beginning is redundant.
1503 (when (eq (aref doc-text 0) ?*) 1503 (when (eq (aref doc-text 0) ?*)
1504 (setq doc-text (substring doc-text 1))) 1504 (setq doc-text (substring doc-text 1)))
@@ -1751,7 +1751,7 @@ If END is omitted, it defaults to the length of LIST."
1751 :action 'widget-url-link-action) 1751 :action 'widget-url-link-action)
1752 1752
1753(defun widget-url-link-action (widget &optional event) 1753(defun widget-url-link-action (widget &optional event)
1754 "Open the url specified by WIDGET." 1754 "Open the URL specified by WIDGET."
1755 (browse-url (widget-value widget))) 1755 (browse-url (widget-value widget)))
1756 1756
1757;;; The `function-link' Widget. 1757;;; The `function-link' Widget.
@@ -1791,7 +1791,7 @@ If END is omitted, it defaults to the length of LIST."
1791 :action 'widget-emacs-library-link-action) 1791 :action 'widget-emacs-library-link-action)
1792 1792
1793(defun widget-emacs-library-link-action (widget &optional event) 1793(defun widget-emacs-library-link-action (widget &optional event)
1794 "Find the Emacs Library file specified by WIDGET." 1794 "Find the Emacs library file specified by WIDGET."
1795 (find-file (locate-library (widget-value widget)))) 1795 (find-file (locate-library (widget-value widget))))
1796 1796
1797;;; The `emacs-commentary-link' Widget. 1797;;; The `emacs-commentary-link' Widget.
@@ -1872,7 +1872,7 @@ the earlier input."
1872 (insert value) 1872 (insert value)
1873 (and size 1873 (and size
1874 (< (length value) size) 1874 (< (length value) size)
1875 (insert-char ?\ (- size (length value)))) 1875 (insert-char ?\s (- size (length value))))
1876 (unless (memq widget widget-field-list) 1876 (unless (memq widget widget-field-list)
1877 (setq widget-field-new (cons widget widget-field-new))) 1877 (setq widget-field-new (cons widget widget-field-new)))
1878 (move-marker (cdr overlay) (point)) 1878 (move-marker (cdr overlay) (point))
@@ -1905,7 +1905,7 @@ the earlier input."
1905 (while (and size 1905 (while (and size
1906 (not (zerop size)) 1906 (not (zerop size))
1907 (> to from) 1907 (> to from)
1908 (eq (char-after (1- to)) ?\ )) 1908 (eq (char-after (1- to)) ?\s))
1909 (setq to (1- to))) 1909 (setq to (1- to)))
1910 (let ((result (buffer-substring-no-properties from to))) 1910 (let ((result (buffer-substring-no-properties from to)))
1911 (when secret 1911 (when secret
@@ -2186,7 +2186,7 @@ when he invoked the menu."
2186If the item is checked, CHOSEN is a cons whose cdr is the value." 2186If the item is checked, CHOSEN is a cons whose cdr is the value."
2187 (and (eq (preceding-char) ?\n) 2187 (and (eq (preceding-char) ?\n)
2188 (widget-get widget :indent) 2188 (widget-get widget :indent)
2189 (insert-char ? (widget-get widget :indent))) 2189 (insert-char ?\s (widget-get widget :indent)))
2190 (widget-specify-insert 2190 (widget-specify-insert
2191 (let* ((children (widget-get widget :children)) 2191 (let* ((children (widget-get widget :children))
2192 (buttons (widget-get widget :buttons)) 2192 (buttons (widget-get widget :buttons))
@@ -2366,7 +2366,7 @@ Return an alist of (TYPE MATCH)."
2366 ;; (setq type (widget-convert type)) 2366 ;; (setq type (widget-convert type))
2367 (and (eq (preceding-char) ?\n) 2367 (and (eq (preceding-char) ?\n)
2368 (widget-get widget :indent) 2368 (widget-get widget :indent)
2369 (insert-char ? (widget-get widget :indent))) 2369 (insert-char ?\s (widget-get widget :indent)))
2370 (widget-specify-insert 2370 (widget-specify-insert
2371 (let* ((value (widget-get widget :value)) 2371 (let* ((value (widget-get widget :value))
2372 (children (widget-get widget :children)) 2372 (children (widget-get widget :children))
@@ -2544,7 +2544,7 @@ Return an alist of (TYPE MATCH)."
2544 ;; (let ((widget-push-button-gui widget-editable-list-gui)) 2544 ;; (let ((widget-push-button-gui widget-editable-list-gui))
2545 (cond ((eq escape ?i) 2545 (cond ((eq escape ?i)
2546 (and (widget-get widget :indent) 2546 (and (widget-get widget :indent)
2547 (insert-char ?\ (widget-get widget :indent))) 2547 (insert-char ?\s (widget-get widget :indent)))
2548 (apply 'widget-create-child-and-convert 2548 (apply 'widget-create-child-and-convert
2549 widget 'insert-button 2549 widget 'insert-button
2550 (widget-get widget :append-button-args))) 2550 (widget-get widget :append-button-args)))
@@ -2656,7 +2656,7 @@ Return an alist of (TYPE MATCH)."
2656 (widget-specify-insert 2656 (widget-specify-insert
2657 (save-excursion 2657 (save-excursion
2658 (and (widget-get widget :indent) 2658 (and (widget-get widget :indent)
2659 (insert-char ?\ (widget-get widget :indent))) 2659 (insert-char ?\s (widget-get widget :indent)))
2660 (insert (widget-get widget :entry-format))) 2660 (insert (widget-get widget :entry-format)))
2661 ;; Parse % escapes in format. 2661 ;; Parse % escapes in format.
2662 (while (re-search-forward "%\\(.\\)" nil t) 2662 (while (re-search-forward "%\\(.\\)" nil t)
@@ -2720,7 +2720,7 @@ Return an alist of (TYPE MATCH)."
2720 value (cdr answer)) 2720 value (cdr answer))
2721 (and (eq (preceding-char) ?\n) 2721 (and (eq (preceding-char) ?\n)
2722 (widget-get widget :indent) 2722 (widget-get widget :indent)
2723 (insert-char ?\ (widget-get widget :indent))) 2723 (insert-char ?\s (widget-get widget :indent)))
2724 (push (cond ((null answer) 2724 (push (cond ((null answer)
2725 (widget-create-child widget arg)) 2725 (widget-create-child widget arg))
2726 ((widget-get arg :inline) 2726 ((widget-get arg :inline)
@@ -2859,7 +2859,7 @@ link for that string."
2859 (narrow-to-region from to) 2859 (narrow-to-region from to)
2860 (goto-char (point-min)) 2860 (goto-char (point-min))
2861 (while (search-forward "\n" nil t) 2861 (while (search-forward "\n" nil t)
2862 (insert-char ?\ indent))))))) 2862 (insert-char ?\s indent)))))))
2863 2863
2864;;; The `documentation-string' Widget. 2864;;; The `documentation-string' Widget.
2865 2865
@@ -2879,7 +2879,7 @@ link for that string."
2879 (let ((before (substring doc 0 (match-beginning 0))) 2879 (let ((before (substring doc 0 (match-beginning 0)))
2880 (after (substring doc (match-beginning 0))) 2880 (after (substring doc (match-beginning 0)))
2881 button) 2881 button)
2882 (insert before ?\ ) 2882 (insert before ?\s)
2883 (widget-documentation-link-add widget start (point)) 2883 (widget-documentation-link-add widget start (point))
2884 (setq button 2884 (setq button
2885 (widget-create-child-and-convert 2885 (widget-create-child-and-convert
@@ -2893,7 +2893,7 @@ link for that string."
2893 (when shown 2893 (when shown
2894 (setq start (point)) 2894 (setq start (point))
2895 (when (and indent (not (zerop indent))) 2895 (when (and indent (not (zerop indent)))
2896 (insert-char ?\ indent)) 2896 (insert-char ?\s indent))
2897 (insert after) 2897 (insert after)
2898 (widget-documentation-link-add widget start (point))) 2898 (widget-documentation-link-add widget start (point)))
2899 (widget-put widget :buttons (list button))) 2899 (widget-put widget :buttons (list button)))
@@ -3594,7 +3594,7 @@ example:
3594 (widget-apply widget :notify widget event)))) 3594 (widget-apply widget :notify widget event))))
3595 3595
3596(defun widget-color-notify (widget child &optional event) 3596(defun widget-color-notify (widget child &optional event)
3597 "Update the sample, and notofy the parent." 3597 "Update the sample, and notify the parent."
3598 (overlay-put (widget-get widget :sample-overlay) 3598 (overlay-put (widget-get widget :sample-overlay)
3599 'face (widget-apply widget :sample-face-get)) 3599 'face (widget-apply widget :sample-face-get))
3600 (widget-default-notify widget child event)) 3600 (widget-default-notify widget child event))