[Emacs-diffs] trunk r116358: * font-lock.el (font-lock-value-in-major-mode): Doc fix

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 116358
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/12282
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2014-02-08 19:25:19 -0800
message:
  * font-lock.el (font-lock-value-in-major-mode): Doc fix
  
  Clarify the meaning of the parameter.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/font-lock.el              fontlock.el-20091113204419-o5vbwnq5f7feedwu-603

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-09 03:02:45 +0000
+++ b/lisp/ChangeLog    2014-02-09 03:25:19 +0000
@@ -1,5 +1,8 @@
 2014-02-09  Lars Ingebrigtsen  <address@hidden>
 
+       * font-lock.el (font-lock-value-in-major-mode): Clarify the
+       meaning of the parameter (bug#12282).
+
        * files.el (find-file-noselect): Clarify prompt when changing
        readedness (bug#13261).
        (locate-file): Suffixes aren't returned, so don't say that they

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2014-01-14 20:37:28 +0000
+++ b/lisp/font-lock.el 2014-02-09 03:25:19 +0000
@@ -1764,12 +1764,14 @@
                                 (funcall keywords)
                               (eval keywords)))))
 
-(defun font-lock-value-in-major-mode (alist)
-  "Return value in ALIST for `major-mode', or ALIST if it is not an alist.
-Structure is ((MAJOR-MODE . VALUE) ...) where MAJOR-MODE may be t."
-  (if (consp alist)
-      (cdr (or (assq major-mode alist) (assq t alist)))
-    alist))
+(defun font-lock-value-in-major-mode (values)
+  "If VALUES is an list, use `major-mode' as a key and return the `assq' value.
+VALUES should then be an alist on the form ((MAJOR-MODE . VALUE) ...) where
+MAJOR-MODE may be t.
+If VALUES isn't a list, return VALUES."
+  (if (consp values)
+      (cdr (or (assq major-mode values) (assq t values)))
+    values))
 
 (defun font-lock-choose-keywords (keywords level)
   "Return LEVELth element of KEYWORDS.