From d5b27848d6272a979ba59455ef9ccc8feb54e1e8 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 20 Jun 2013 13:29:30 +0200 Subject: [PATCH] lisp/(cus-edit,custom).el: Fix typos; use setq-local, string-match-p, looking-at-p. * lisp/cus-edit.el: (custom-commands): Fix typos. (custom-display): Fix tooltip text. (custom-magic-alist, custom-filter-face-spec, custom-group-members): Fix typos in docstrings. (custom--initialize-widget-variables, Custom-mode): Use `setq-local'. (custom-unlispify-menu-entry, custom-magic-value-create) (custom-add-see-also, custom-group-value-create): Use ?\s. (custom-guess-type, customize-apropos, editable-field) (custom-face-value-create): Use `string-match-p'. (custom-save-variables, custom-save-faces): Use `looking-at-p'. * lisp/custom.el (custom-load-symbol): Use `string-match-p'. --- lisp/ChangeLog | 13 ++++++++ lisp/cus-edit.el | 90 ++++++++++++++++++++++++++++---------------------------- lisp/custom.el | 12 ++++---- 3 files changed, 64 insertions(+), 51 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 773f8913533..4633e83292f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,18 @@ 2013-06-20 Juanma Barranquero + * cus-edit.el (custom-commands): Fix typos. + (custom-display): Fix tooltip text. + (custom-magic-alist, custom-filter-face-spec, custom-group-members): + Fix typos in docstrings. + (custom--initialize-widget-variables, Custom-mode): Use `setq-local'. + (custom-unlispify-menu-entry, custom-magic-value-create) + (custom-add-see-also, custom-group-value-create): Use ?\s. + (custom-guess-type, customize-apropos, editable-field) + (custom-face-value-create): Use `string-match-p'. + (custom-save-variables, custom-save-faces): Use `looking-at-p'. + + * custom.el (custom-load-symbol): Use `string-match-p'. + * ansi-color.el: Convert to lexical binding. (ansi-colors): Fix URL. (ansi-color-context, ansi-color-context-region): Use defvar-local. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index d4966078e1d..b50c1a5155b 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -558,7 +558,7 @@ value unless you are sure you know what it does." (setq prefixes nil) (delete-region (point-min) (point))) (setq prefixes (cdr prefixes)))))) - (subst-char-in-region (point-min) (point-max) ?- ?\ t) + (subst-char-in-region (point-min) (point-max) ?- ?\s t) (capitalize-region (point-min) (point-max)) (unless no-suffix (goto-char (point-max)) @@ -629,7 +629,7 @@ if that fails, the doc string with `custom-guess-doc-alist'." (while names (setq current (car names) names (cdr names)) - (when (string-match (nth 0 current) name) + (when (string-match-p (nth 0 current) name) (setq found (nth 1 current) names nil))) (unless found @@ -639,7 +639,7 @@ if that fails, the doc string with `custom-guess-doc-alist'." (while docs (setq current (car docs) docs (cdr docs)) - (when (string-match (nth 0 current) doc) + (when (string-match-p (nth 0 current) doc) (setq found (nth 1 current) docs nil)))))) found)) @@ -731,7 +731,7 @@ groups after non-groups, if nil do not order groups at all." (defvar custom-commands '((" Apply " Custom-set t - "Apply settings (for the current session only)" + "Apply settings (for the current session only)." "index" "Apply") (" Apply and Save " Custom-save @@ -1421,8 +1421,8 @@ suggest to customize that face, if it's customizable." "Customize loaded options, faces and groups matching PATTERN. PATTERN can be a word, a list of words (separated by spaces), or a regexp (using some regexp special characters). If it is a word, -search for matches for that word as a substring. If it is a list of words, -search for matches for any two (or more) of those words. +search for matches for that word as a substring. If it is a list of +words, search for matches for any two (or more) of those words. If TYPE is `options', include only options. If TYPE is `faces', include only faces. @@ -1435,7 +1435,7 @@ If TYPE is `groups', include only groups." (let (found) (mapatoms `(lambda (symbol) - (when (string-match apropos-regexp (symbol-name symbol)) + (when (string-match-p apropos-regexp (symbol-name symbol)) ,(if (memq type '(nil groups)) '(if (get symbol 'custom-group) (push (list symbol 'custom-group) found))) @@ -1832,7 +1832,7 @@ item in another window.\n\n")) (widget-put (get 'editable-field 'widget-type) :custom-show (lambda (_widget value) (let ((pp (pp-to-string value))) - (cond ((string-match "\n" pp) + (cond ((string-match-p "\n" pp) nil) ((> (length pp) 40) nil) @@ -1973,7 +1973,7 @@ GROUP-DESC is a string describing the state for groups. If this is left out, ITEM-DESC will be used. The string %c in either description will be replaced with the -category of the item. These are `group'. `option', and `face'. +category of the item. These are `group', `option', and `face'. The list should be sorted most significant first.") @@ -2039,7 +2039,7 @@ and `face'." (when (and (eq category 'group) (not (and (eq custom-buffer-style 'links) (> (widget-get parent :custom-level) 1)))) - (insert-char ?\ (* custom-buffer-indent + (insert-char ?\s (* custom-buffer-indent (widget-get parent :custom-level)))) (push (widget-create-child-and-convert widget 'choice-item @@ -2064,7 +2064,7 @@ and `face'." (when (and (eq category 'group) (not (and (eq custom-buffer-style 'links) (> (widget-get parent :custom-level) 1)))) - (insert-char ?\ (* custom-buffer-indent + (insert-char ?\s (* custom-buffer-indent (widget-get parent :custom-level)))) (when custom-magic-show-button (when custom-magic-show @@ -2293,7 +2293,7 @@ Insert PREFIX first if non-nil." (indent (widget-get widget :indent))) (when links (when indent - (insert-char ?\ indent)) + (insert-char ?\s indent)) (when prefix (insert prefix)) (insert "See also ") @@ -3227,7 +3227,7 @@ OS/2 Presentation Manager.") pm) (const :format "W32 " :sibling-args (:help-echo "\ -Windows NT/9X.") +MS Windows.") w32) (const :format "NS " :sibling-args (:help-echo "\ @@ -3348,7 +3348,7 @@ The following properties have special meanings for this widget: "Converted version of the `custom-face-all' widget.") (defun custom-filter-face-spec (spec filter-index &optional default-filter) - "Return a canonicalized version of SPEC using. + "Return a canonicalized version of SPEC. FILTER-INDEX is the index in the entry for each attribute in `custom-face-attributes' at which the appropriate filter function can be found, and DEFAULT-FILTER is the filter to apply for attributes that @@ -3473,7 +3473,7 @@ the present value is saved to its :shown-value property instead." (widget-specify-sample widget opoint (point))) (insert (cond ((eq custom-buffer-style 'face) " ") - ((string-match "face\\'" tag) ":") + ((string-match-p "face\\'" tag) ":") (t " face: "))) ;; Face sample. @@ -3947,7 +3947,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'." (defun custom-group-members (symbol groups-only) "Return SYMBOL's custom group members. -If GROUPS-ONLY non-nil, return only those members that are groups." +If GROUPS-ONLY is non-nil, return only those members that are groups." (if (not groups-only) (get symbol 'custom-group) (let (members) @@ -4058,7 +4058,7 @@ If GROUPS-ONLY non-nil, return only those members that are groups." :tag tag symbol) buttons) - (insert-char ?\ (* custom-buffer-indent (1- level))) + (insert-char ?\s (* custom-buffer-indent (1- level))) (insert "-- ") (push (widget-create-child-and-convert widget 'custom-group-visibility @@ -4098,7 +4098,7 @@ If GROUPS-ONLY non-nil, return only those members that are groups." (when (eq level 1) (if (custom-add-parent-links widget "Parent groups:") (insert "\n"))) - (insert-char ?\ (* custom-buffer-indent (1- level))) + (insert-char ?\s (* custom-buffer-indent (1- level))) ;; Create tag. (let ((start (point))) (insert tag " group: ") @@ -4137,11 +4137,11 @@ If GROUPS-ONLY non-nil, return only those members that are groups." (if nil ;;; This should test that the buffer ;;; was not made to display a group. (when (eq level 1) - (insert-char ?\ custom-buffer-indent) + (insert-char ?\s custom-buffer-indent) (custom-add-parent-links widget))) (custom-add-see-also widget (make-string (* custom-buffer-indent level) - ?\ )) + ?\s)) ;; Members. (message "Creating group...") (let* ((members (custom-sort-items @@ -4326,7 +4326,7 @@ Note that both lines are necessary: the first line tells Custom to save all customizations in this file, but does not load it. When you change this variable outside Custom, look in the -previous custom file \(usually your init file) for the +previous custom file (usually your init file) for the forms `(custom-set-variables ...)' and `(custom-set-faces ...)', and copy them (whichever ones you find) to the new custom file. This will preserve your existing customizations. @@ -4337,7 +4337,7 @@ option itself, into the file you specify, overwriting any `custom-set-variables' and `custom-set-faces' forms already present in that file. It will not delete any customizations from the old custom file. You should do that manually if that is what you -want. You also have to put something like `\(load \"CUSTOM-FILE\") +want. You also have to put something like `(load \"CUSTOM-FILE\") in your init file, where CUSTOM-FILE is the actual name of the file. Otherwise, Emacs will not load the file when it starts up, and hence will not set `custom-file' to that file either." @@ -4346,7 +4346,7 @@ and hence will not set `custom-file' to that file either." :doc "Please read entire docstring below before setting \ this through Custom. -Click on \"More\" \(or position point there and press RETURN) +Click on \"More\" (or position point there and press RETURN) if only the first line of the docstring is shown.")) :group 'customize) @@ -4553,7 +4553,7 @@ This function does not save the buffer." (if (bolp) (princ " ")) (princ ")") - (unless (looking-at "\n") + (unless (looking-at-p "\n") (princ "\n"))))) (defun custom-save-faces () @@ -4608,7 +4608,7 @@ This function does not save the buffer." (if (bolp) (princ " ")) (princ ")") - (unless (looking-at "\n") + (unless (looking-at-p "\n") (princ "\n"))))) ;;; The Customize Menu. @@ -4759,22 +4759,22 @@ If several parents are listed, go to the first of them." (message "To install your edits, invoke [State] and choose the Set operation"))) (defun custom--initialize-widget-variables () - (set (make-local-variable 'widget-documentation-face) 'custom-documentation) - (set (make-local-variable 'widget-button-face) custom-button) - (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed) - (set (make-local-variable 'widget-mouse-face) custom-button-mouse) + (setq-local widget-documentation-face 'custom-documentation) + (setq-local widget-button-face custom-button) + (setq-local widget-button-pressed-face custom-button-pressed) + (setq-local widget-mouse-face custom-button-mouse) ;; We need this because of the "More" button on docstrings. ;; Otherwise clicking on "More" can push point offscreen, which ;; causes the window to recenter on point, which pushes the ;; newly-revealed docstring offscreen; which is annoying. -- cyd. - (set (make-local-variable 'widget-button-click-moves-point) t) + (setq-local widget-button-click-moves-point t) ;; When possible, use relief for buttons, not bracketing. This test ;; may not be optimal. (when custom-raised-buttons - (set (make-local-variable 'widget-push-button-prefix) "") - (set (make-local-variable 'widget-push-button-suffix) "") - (set (make-local-variable 'widget-link-prefix) "") - (set (make-local-variable 'widget-link-suffix) "")) + (setq-local widget-push-button-prefix "") + (setq-local widget-push-button-suffix "") + (setq-local widget-link-prefix "") + (setq-local widget-link-suffix "")) (setq show-trailing-whitespace nil)) (define-obsolete-variable-alias 'custom-mode-hook 'Custom-mode-hook "23.1") @@ -4802,17 +4802,17 @@ Entry to this mode calls the value of `Custom-mode-hook' if that value is non-nil." (use-local-map custom-mode-map) (easy-menu-add Custom-mode-menu) - (set (make-local-variable 'tool-bar-map) - (or custom-tool-bar-map - ;; Set up `custom-tool-bar-map'. - (let ((map (make-sparse-keymap))) - (mapc - (lambda (arg) - (tool-bar-local-item-from-menu - (nth 1 arg) (nth 4 arg) map custom-mode-map - :label (nth 5 arg))) - custom-commands) - (setq custom-tool-bar-map map)))) + (setq-local tool-bar-map + (or custom-tool-bar-map + ;; Set up `custom-tool-bar-map'. + (let ((map (make-sparse-keymap))) + (mapc + (lambda (arg) + (tool-bar-local-item-from-menu + (nth 1 arg) (nth 4 arg) map custom-mode-map + :label (nth 5 arg))) + custom-commands) + (setq custom-tool-bar-map map)))) (make-local-variable 'custom-options) (make-local-variable 'custom-local-buffer) (custom--initialize-widget-variables) diff --git a/lisp/custom.el b/lisp/custom.el index 4cf9609123a..f2d58084e9e 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -77,7 +77,7 @@ if any, or VALUE." "Initialize SYMBOL based on VALUE. Set the symbol, using its `:set' function (or `set-default' if it has none). The value is either the symbol's current value - \(as obtained using the `:get' function), if any, + (as obtained using the `:get' function), if any, or the value in the symbol's `saved-value' property if any, or (last of all) VALUE." (funcall (or (get symbol 'custom-set) 'set-default) @@ -319,7 +319,7 @@ If SYMBOL has a local binding, then this form affects the local binding. This is normally not what you want. Thus, if you need to load a file defining variables with this form, or with `defvar' or `defconst', you should always load that file -_outside_ any bindings for these variables. \(`defvar' and +_outside_ any bindings for these variables. (`defvar' and `defconst' behave similarly in this respect.) See Info node `(elisp) Customization' in the Emacs Lisp manual @@ -541,8 +541,8 @@ Fourth argument TYPE is the custom option type." (defun custom-add-dependencies (symbol value) "To the custom option SYMBOL, add dependencies specified by VALUE. VALUE should be a list of symbols. For each symbol in that list, -this specifies that SYMBOL should be set after the specified symbol, if -both appear in constructs like `custom-set-variables'." +this specifies that SYMBOL should be set after the specified symbol, +if both appear in constructs like `custom-set-variables'." (unless (listp value) (error "Invalid custom dependency `%s'" value)) (let* ((deps (get symbol 'custom-dependencies)) @@ -647,7 +647,7 @@ The result is that the change is treated as having been made through Custom." (found nil)) (dolist (loaded load-history) (and (stringp (car loaded)) - (string-match regexp (car loaded)) + (string-match-p regexp (car loaded)) (setq found t))) found)) ;; Without this, we would load cus-edit recursively. @@ -937,7 +937,7 @@ SYMBOL is the variable name, and EXP is an expression which evaluates to the customized value. EXP will also be stored, without evaluating it, in SYMBOL's `saved-value' property, so that it can be restored via the Customize interface. It is also -added to the alist in SYMBOL's `theme-value' property \(by +added to the alist in SYMBOL's `theme-value' property (by calling `custom-push-theme'). NOW, if present and non-nil, means to install the variable's -- 2.11.4.GIT