[Emacs-diffs] emacs etc/ChangeLog etc/NEWS lisp/ChangeLog lis...

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/24 19:19:46

Modified files:
        etc            : ChangeLog NEWS 
        lisp           : ChangeLog help-fns.el 

Log message:
        * help-fns.el (help-downcase-arguments): New option, defaulting to nil.
          (help-default-arg-highlight): Remove.
          (help-highlight-arg): New function.
          (help-do-arg-highlight): Use it.
          Suggested by Drew Adams <address@hidden>.  (Bug#4510, bug#4520)
        
        * NEWS: Mention new variable `help-downcase-arguments'
          and new default for arguments in *Help* buffers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/ChangeLog?cvsroot=emacs&r1=1.804&r2=1.805
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2089&r2=1.2090
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16253&r2=1.16254
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-fns.el?cvsroot=emacs&r1=1.139&r2=1.140

Patches:
Index: etc/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/ChangeLog,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -b -r1.804 -r1.805
--- etc/ChangeLog       17 Sep 2009 23:04:41 -0000      1.804
+++ etc/ChangeLog       24 Sep 2009 19:19:41 -0000      1.805
@@ -1,3 +1,8 @@
+2009-09-22  Juanma Barranquero  <address@hidden>
+
+       * NEWS: Mention new variable `help-downcase-arguments'
+       and new default for arguments in *Help* buffers.
+
 2009-09-15  Juanma Barranquero  <address@hidden>
 
        * NEWS: Mention new behavior of -Q and new variable

Index: etc/NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/NEWS,v
retrieving revision 1.2089
retrieving revision 1.2090
diff -u -b -r1.2089 -r1.2090
--- etc/NEWS    22 Sep 2009 02:31:54 -0000      1.2089
+++ etc/NEWS    24 Sep 2009 19:19:41 -0000      1.2090
@@ -47,6 +47,9 @@
 
 * Changes in Emacs 23.2
 
+** Function arguments in *Help* buffers are now in uppercase by default.
+You can customize the new variable `help-downcase-arguments' to change it.
+
 ** Unibyte sessions are now considered obsolete.
 I.e. the use of the environment variable EMACS_UNIBYTE, or command line
 arguments --unibyte, --multibyte, --no-multibyte, and --no-unibyte

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16253
retrieving revision 1.16254
diff -u -b -r1.16253 -r1.16254
--- lisp/ChangeLog      24 Sep 2009 18:10:44 -0000      1.16253
+++ lisp/ChangeLog      24 Sep 2009 19:19:43 -0000      1.16254
@@ -1,3 +1,11 @@
+2009-09-24  Juanma Barranquero  <address@hidden>
+
+       * help-fns.el (help-downcase-arguments): New option, defaulting to nil.
+       (help-default-arg-highlight): Remove.
+       (help-highlight-arg): New function.
+       (help-do-arg-highlight): Use it.
+       Suggested by Drew Adams <address@hidden>.  (Bug#4510, bug#4520)
+
 2009-09-24  Stefan Monnier  <address@hidden>
 
        * term.el (term-set-scroll-region, term-handle-ansi-escape):

Index: lisp/help-fns.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- lisp/help-fns.el    15 Sep 2009 02:35:47 -0000      1.139
+++ lisp/help-fns.el    24 Sep 2009 19:19:46 -0000      1.140
@@ -158,14 +158,17 @@
            (concat "src/" file)
          file)))))
 
-(defun help-default-arg-highlight (arg)
-  "Default function to highlight arguments in *Help* buffers.
-It returns ARG in face `help-argument-name'; ARG is also
-downcased if it displays differently than the default
-face (according to `face-differs-from-default-p')."
-  (propertize (if (face-differs-from-default-p 'help-argument-name)
-                  (downcase arg)
-                arg)
+(defcustom help-downcase-arguments nil
+  "If non-nil, argument names in *Help* buffers are downcased."
+  :type 'boolean
+  :group 'help
+  :version "23.2")
+
+(defun help-highlight-arg (arg)
+  "Highlight ARG as an argument name for a *Help* buffer.
+Return ARG in face `help-argument-name'; ARG is also downcased
+if the variable `help-downcase-arguments' is non-nil."
+  (propertize (if help-downcase-arguments (downcase arg) arg)
               'face 'help-argument-name))
 
 (defun help-do-arg-highlight (doc args)
@@ -184,7 +187,7 @@
                          "\\(?:-[a-z0-9-]+\\)?"  ; for ARG-xxx, ARG-n
                          "\\(?:-[{([<`\"].*?\\)?"; for ARG-{x}, (x), <x>, [x], 
`x'
                          "\\>")                  ; end of word
-                 (help-default-arg-highlight arg)
+                 (help-highlight-arg arg)
                  doc t t 1)))))
 
 (defun help-highlight-arguments (usage doc &rest args)