aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-10-29 18:42:58 +0800
committerChong Yidong2012-10-29 18:42:58 +0800
commit329c48d8b26a8943ee47682916f83f4fb60f608e (patch)
treebb9cadb2762dcc2c654cb9998f16126ff34cf768
parent4574557789a826c88514ee3b6a661e4869836da7 (diff)
downloademacs-329c48d8b26a8943ee47682916f83f4fb60f608e.tar.gz
emacs-329c48d8b26a8943ee47682916f83f4fb60f608e.zip
* info.el (Info-complete-menu-item): Avoid duplicates.
Fixes: debbugs:12705
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/info.el1
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 999db57efc0..4edf3cdd03b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,7 @@
12012-10-29 Kevin Ryde <user42@zip.com.au>
2
3 * woman.el (woman-parse-numeric-value): Handle picas correctly
4 (Bug#12639).
5
62012-10-29 Chong Yidong <cyd@gnu.org> 12012-10-29 Chong Yidong <cyd@gnu.org>
7 2
3 * info.el (Info-complete-menu-item): Avoid duplicates (Bug#12705).
4
8 * startup.el (fancy-about-screen): Don't message (Bug#12680). 5 * startup.el (fancy-about-screen): Don't message (Bug#12680).
9 6
10 * thingatpt.el (thing-at-point): Doc fix (Bug#12691). 7 * thingatpt.el (thing-at-point): Doc fix (Bug#12691).
@@ -14,6 +11,11 @@
14 * face-remap.el (face-remap-add-relative): Handle the case where a 11 * face-remap.el (face-remap-add-relative): Handle the case where a
15 face-remapping-alist entry is a cons cell (Bug#12762). 12 face-remapping-alist entry is a cons cell (Bug#12762).
16 13
142012-10-29 Kevin Ryde <user42@zip.com.au>
15
16 * woman.el (woman-parse-numeric-value): Handle picas correctly
17 (Bug#12639).
18
172012-10-29 Glenn Morris <rgm@gnu.org> 192012-10-29 Glenn Morris <rgm@gnu.org>
18 20
19 * emacs-lisp/cl.el (defsetf): Doc fix. 21 * emacs-lisp/cl.el (defsetf): Doc fix.
diff --git a/lisp/info.el b/lisp/info.el
index 5862e5e850f..36ffa806f04 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2646,6 +2646,7 @@ Because of ambiguities, this should be concatenated with something like
2646 (while (re-search-forward pattern nil t) 2646 (while (re-search-forward pattern nil t)
2647 (push (match-string-no-properties 1) 2647 (push (match-string-no-properties 1)
2648 completions)) 2648 completions))
2649 (setq completions (delete-dups completions))
2649 ;; Check subsequent nodes if applicable. 2650 ;; Check subsequent nodes if applicable.
2650 (or (and Info-complete-next-re 2651 (or (and Info-complete-next-re
2651 (setq nextnode (Info-extract-pointer "next" t)) 2652 (setq nextnode (Info-extract-pointer "next" t))