aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-04-13 22:31:50 -0400
committerStefan Monnier2012-04-13 22:31:50 -0400
commitab036cd7bdd7b087047d241ffb5607d14942179e (patch)
treee23fcd09ae5352fc52ae4e8bbece56c61bea690a
parent1e103a7cd8a0210ad6d66d6105192e8ab8df19e5 (diff)
downloademacs-ab036cd7bdd7b087047d241ffb5607d14942179e.tar.gz
emacs-ab036cd7bdd7b087047d241ffb5607d14942179e.zip
* lisp/progmodes/which-func.el (which-func-modes): Change default.
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/which-func.el8
3 files changed, 11 insertions, 6 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 23d6dc0cd89..4ec33eae625 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -50,6 +50,8 @@ character when doing minibuffer filename prompts.
50 50
51* Changes in Specialized Modes and Packages in Emacs 24.2 51* Changes in Specialized Modes and Packages in Emacs 24.2
52 52
53** which-function-mode now applies to all applicable major modes by default.
54
53** erc will look up server/channel names via auth-source and use the 55** erc will look up server/channel names via auth-source and use the
54 channel keys found, if any. 56 channel keys found, if any.
55 57
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ca8751216f..858c4285c7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/which-func.el (which-func-modes): Change default.
4
12012-04-14 Kim F. Storm <storm@cua.dk> 52012-04-14 Kim F. Storm <storm@cua.dk>
2 6
3 * emulation/cua-base.el (cua-exchange-point-and-mark): Just call 7 * emulation/cua-base.el (cua-exchange-point-and-mark): Just call
@@ -94,8 +98,7 @@
942012-04-13 Ken Brown <kbrown@cornell.edu> 982012-04-13 Ken Brown <kbrown@cornell.edu>
95 99
96 * net/browse-url.el (browse-url-file-url): Remove Cygwin hack; 100 * net/browse-url.el (browse-url-file-url): Remove Cygwin hack;
97 this is no longer needed now that cygstart understands file:// 101 this is no longer needed now that cygstart understands file:// URLs.
98 URLs.
99 (browse-url-filename-alist): For the same reason, don't modify 102 (browse-url-filename-alist): For the same reason, don't modify
100 file:// URLs on Cygwin. 103 file:// URLs on Cygwin.
101 104
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index f1c65272625..bacc542a388 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -72,10 +72,10 @@
72 :group 'tools 72 :group 'tools
73 :version "20.3") 73 :version "20.3")
74 74
75(defcustom which-func-modes 75(defcustom which-func-modes t
76 '(emacs-lisp-mode c-mode c++-mode objc-mode perl-mode cperl-mode python-mode 76 ;; '(emacs-lisp-mode c-mode c++-mode objc-mode perl-mode cperl-mode python-mode
77 makefile-mode sh-mode fortran-mode f90-mode ada-mode 77 ;; makefile-mode sh-mode fortran-mode f90-mode ada-mode
78 diff-mode) 78 ;; diff-mode)
79 "List of major modes for which Which Function mode should be used. 79 "List of major modes for which Which Function mode should be used.
80For other modes it is disabled. If this is equal to t, 80For other modes it is disabled. If this is equal to t,
81then Which Function mode is enabled in any major mode that supports it." 81then Which Function mode is enabled in any major mode that supports it."