[Emacs-diffs] Changes to emacs/lisp/help-fns.el

[Juanma Barranquero]

Index: emacs/lisp/help-fns.el
diff -c emacs/lisp/help-fns.el:1.74 emacs/lisp/help-fns.el:1.75
*** emacs/lisp/help-fns.el:1.74 Mon Sep 12 15:35:22 2005
--- emacs/lisp/help-fns.el      Tue Sep 13 14:58:35 2005
***************
*** 269,290 ****
  (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))
  
  (defun help-highlight-arguments (usage doc &rest args)
    (when usage
--- 269,288 ----
  (defun help-do-arg-highlight (doc args)
    (with-syntax-table (make-syntax-table emacs-lisp-mode-syntax-table)
      (modify-syntax-entry ?\- "w")
!     (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,718 ****
            (dotimes (i 95)
              (let ((elt (aref docs i)))
                (when elt
!                 (insert (+ i ?\ ) ": " elt "\n"))))
            (while (setq table (char-table-parent table))
              (insert "\nThe parent category table is:")
              (describe-vector table 'help-describe-category-set))))))))
--- 710,716 ----
            (dotimes (i 95)
              (let ((elt (aref docs i)))
                (when elt
!                 (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))))))))