aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-10-29 17:58:49 +0800
committerChong Yidong2012-10-29 17:58:49 +0800
commit1913c5f53b1055bcd66d06d721b4bef69ca7a03f (patch)
treef6cbc100d8eee141e1dc7db20afb3e4c786c9f1f
parent894b9dd938ca50ca24faf2e366631a9ab9cd79b7 (diff)
downloademacs-1913c5f53b1055bcd66d06d721b4bef69ca7a03f.tar.gz
emacs-1913c5f53b1055bcd66d06d721b4bef69ca7a03f.zip
* imenu.el (imenu): Inhibit push-mark message.
Fixes: debbugs:12726
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/imenu.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 093d392d7d3..38a3e3806b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-10-29 Chong Yidong <cyd@gnu.org> 12012-10-29 Chong Yidong <cyd@gnu.org>
2 2
3 * imenu.el (imenu): Inhibit push-mark message (Bug#12726).
4
3 * face-remap.el (face-remap-add-relative): Handle the case where a 5 * face-remap.el (face-remap-add-relative): Handle the case where a
4 face-remapping-alist entry is a cons cell (Bug#12762). 6 face-remapping-alist entry is a cons cell (Bug#12762).
5 7
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 47a2f1e3b40..4686d1cf538 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1018,7 +1018,7 @@ for more information."
1018 (if (stringp index-item) 1018 (if (stringp index-item)
1019 (setq index-item (assoc index-item (imenu--make-index-alist)))) 1019 (setq index-item (assoc index-item (imenu--make-index-alist))))
1020 (when index-item 1020 (when index-item
1021 (push-mark) 1021 (push-mark nil t)
1022 (let* ((is-special-item (listp (cdr index-item))) 1022 (let* ((is-special-item (listp (cdr index-item)))
1023 (function 1023 (function
1024 (if is-special-item 1024 (if is-special-item