; Fix last change (bug#64533)

* lisp/progmodes/which-func.el (which-func-display): Fix quoting
in the doc string.

* etc/NEWS: Announce 'which-func-display'.

diff --git a/etc/NEWS b/etc/NEWS
index d7f5fdc4cbb3a82d6cb1f5ab1cc71fded842a8dc..3cfc36e10daec37428273dfe24adb7c4702d2559 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -264,6 +264,13 @@ docstring, or a comment, or (re)indents the surrounding defun if
 point is not in a comment or a string.  It is by default bound to
 'M-q' in 'prog-mode' and all its descendants.
 
++++
+*** Which Function Mode can now display function names on the header line.
+The new user option 'which-func-display' allows choosing where the
+function name is displayed.  The default is 'mode' to display in the
+mode line.  'header' will display in the header line;
+'mode-and-header' displays in both the header line and mode line.
+
 ** Tramp
 
 +++

diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 631d47bb729e0adaff099884b649d17e526b5a79..09d0250515fb911341fed1e258f3f2ddac7a680d 100644 (file)
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -89,8 +89,8 @@ activation of Which Function until Imenu is used for the first time."
 (defcustom which-func-display 'mode
   "Where to display the function name.
 
-If 'mode, display in the mode line.  If 'header, display in the
-header line.  If 'mode-and-header, display in both."
+If `mode', display in the mode line.  If `header', display in the
+header line.  If `mode-and-header', display in both."
   :type '(choice (const :tag "Display in mode line" mode)
                  (const :tag "Display in header line" header)
                  (const :tag "Display in both header and mode line"