aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-12 15:01:20 +0200
committerLars Magne Ingebrigtsen2011-07-12 15:01:20 +0200
commit9d6f1d90417f8f4b477fb4bc8b8537ed375a1a69 (patch)
tree0722915826036cc7d235f05a3e4e6e843040d76e /lisp
parent48b76ddfd846041c7fb3d5c561a5930b078ee0f8 (diff)
downloademacs-9d6f1d90417f8f4b477fb4bc8b8537ed375a1a69.tar.gz
emacs-9d6f1d90417f8f4b477fb4bc8b8537ed375a1a69.zip
Revert last patch, which wasn't correct.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/menu-bar.el3
2 files changed, 1 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75c6eb01a1e..d503171245d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,5 @@
12011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * menu-bar.el (menu-set-font): Clarify that the default will be
4 saved (bug#3527).
5
6 * progmodes/compile.el (compilation-error-regexp-alist-alist): 3 * progmodes/compile.el (compilation-error-regexp-alist-alist):
7 Fontise bytecomp Error lines more correctly (bug#2490). Fix 4 Fontise bytecomp Error lines more correctly (bug#2490). Fix
8 suggested by Johan Bockgård. 5 suggested by Johan Bockgård.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 2954384d23b..caae40ed8c5 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -673,8 +673,7 @@ by \"Save Options\" in Custom buffers.")
673;; Function for setting/saving default font. 673;; Function for setting/saving default font.
674 674
675(defun menu-set-font () 675(defun menu-set-font ()
676 "Interactively select a font and make it the default. 676 "Interactively select a font and make it the default."
677This new default will be saved for future Emacs sessions."
678 (interactive) 677 (interactive)
679 (let ((font (if (fboundp 'x-select-font) 678 (let ((font (if (fboundp 'x-select-font)
680 (x-select-font) 679 (x-select-font)