From 7a650da0af33822248aacfa229f889044a4043a6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 13 Sep 2005 15:00:21 +0000 Subject: [PATCH] (describe-categories): "?\ " -> "?\s". (help-do-arg-highlight): Recognize also ARG-n, as in `move-to-left-margin' (ARG+n is already recognized). Simplify. --- lisp/ChangeLog | 4 ++++ lisp/help-fns.el | 32 +++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dffbcdecabf..31b7bb49bf1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2005-09-13 Juanma Barranquero + * help-fns.el (describe-categories): "?\ " -> "?\s". + (help-do-arg-highlight): Recognize also ARG-n, as in + `move-to-left-margin' (ARG+n is already recognized). Simplify. + * international/codepage.el (dos-unsupported-char-glyph): * net/newsticker.el (tool-bar-map, w3-mode-map) (w3m-minor-mode-map): diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 2974e65bf88..b7820b778d2 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -269,22 +269,20 @@ face (according to `face-differs-from-default-p')." (defun help-do-arg-highlight (doc args) (with-syntax-table (make-syntax-table emacs-lisp-mode-syntax-table) (modify-syntax-entry ?\- "w") - (while args - (let ((arg (prog1 (car args) (setq args (cdr args))))) - (setq doc (replace-regexp-in-string - ;; This is heuristic, but covers all common cases - ;; except ARG1-ARG2 - (concat "\\<" ; beginning of word - "\\(?:[a-z-]*-\\)?" ; for xxx-ARG - "\\(" - (regexp-quote arg) - "\\)" - "\\(?:es\\|s\\|th\\)?" ; for ARGth, ARGs - "\\(?:-[a-z-]+\\)?" ; for ARG-xxx - "\\>") ; end of word - (help-default-arg-highlight arg) - doc t t 1)))) - doc)) + (dolist (arg args doc) + (setq doc (replace-regexp-in-string + ;; This is heuristic, but covers all common cases + ;; except ARG1-ARG2 + (concat "\\<" ; beginning of word + "\\(?:[a-z-]*-\\)?" ; for xxx-ARG + "\\(" + (regexp-quote arg) + "\\)" + "\\(?:es\\|s\\|th\\)?" ; for ARGth, ARGs + "\\(?:-[a-z0-9-]+\\)?" ; for ARG-xxx, ARG-n + "\\>") ; end of word + (help-default-arg-highlight arg) + doc t t 1))))) (defun help-highlight-arguments (usage doc &rest args) (when usage @@ -712,7 +710,7 @@ BUFFER should be a buffer or a buffer name." (dotimes (i 95) (let ((elt (aref docs i))) (when elt - (insert (+ i ?\ ) ": " elt "\n")))) + (insert (+ i ?\s) ": " elt "\n")))) (while (setq table (char-table-parent table)) (insert "\nThe parent category table is:") (describe-vector table 'help-describe-category-set)))))))) -- 2.39.2