aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO2005-10-18 04:31:16 +0000
committerMasatake YAMATO2005-10-18 04:31:16 +0000
commit283780dc8842d1deb8f7e223f6b88771e256bcb2 (patch)
tree8f1852d1be2262d70182b15478bc1e5a3cfc67fc
parent50071f01ec3b93c87656bc88b9ae796585912855 (diff)
downloademacs-283780dc8842d1deb8f7e223f6b88771e256bcb2.tar.gz
emacs-283780dc8842d1deb8f7e223f6b88771e256bcb2.zip
Install to the CVS repository what I forgot to install in my
2005-10-16 changes. * progmodes/python.el (python-complete-symbol): Pass the common prefix substring of completion to `display-completion-list'. * textmodes/org.el (org-complete): Ditto.
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/progmodes/python.el2
-rw-r--r--lisp/textmodes/org.el2
3 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8486bac69c6..fe4c77a80a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
12005-10-18 Masatake YAMATO <jet@gyve.org> 12005-10-18 Masatake YAMATO <jet@gyve.org>
2 2
3 Install to the CVS repository what I forgot to install in my
4 2005-10-16 changes.
5
6 * progmodes/python.el (python-complete-symbol): Pass the common
7 prefix substring of completion to `display-completion-list'.
8
9 * textmodes/org.el (org-complete): Ditto.
10
112005-10-18 Masatake YAMATO <jet@gyve.org>
12
3 Fix a bug reported by Sven Joachim <sven_joachim@web.de>. 13 Fix a bug reported by Sven Joachim <sven_joachim@web.de>.
4 14
5 * woman.el (WoMan-xref-man-page): New button type derived 15 * woman.el (WoMan-xref-man-page): New button type derived
@@ -219,12 +229,9 @@
219 * progmodes/pascal.el (pascal-complete-word) 229 * progmodes/pascal.el (pascal-complete-word)
220 (pascal-show-completions): Ditto. 230 (pascal-show-completions): Ditto.
221 231
222 * progmodes/python.el (python-complete-symbol): Ditto.
223 232
224 * textmodes/bibtex.el (bibtex-complete-internal): Ditto. 233 * textmodes/bibtex.el (bibtex-complete-internal): Ditto.
225 234
226 * textmodes/org.el (org-complete): Ditto.
227
228 * simple.el (completion-common-substring): New variable. 235 * simple.el (completion-common-substring): New variable.
229 (completion-setup-function): Use `completion-common-substring' 236 (completion-setup-function): Use `completion-common-substring'
230 to put faces. 237 to put faces.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f7788404350..6ed2e39e4e8 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1652,7 +1652,7 @@ Repeating the command scrolls the completion window."
1652 (t 1652 (t
1653 (message "Making completion list...") 1653 (message "Making completion list...")
1654 (with-output-to-temp-buffer "*Completions*" 1654 (with-output-to-temp-buffer "*Completions*"
1655 (display-completion-list completions)) 1655 (display-completion-list completions symbol))
1656 (message "Making completion list...%s" "done")))))))) 1656 (message "Making completion list...%s" "done"))))))))
1657 1657
1658(eval-when-compile (require 'hippie-exp)) 1658(eval-when-compile (require 'hippie-exp))
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index b9542c9fce7..7f0d257e5f6 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -2844,7 +2844,7 @@ At all other locations, this simply calls `ispell-complete-word'."
2844 (message "Making completion list...") 2844 (message "Making completion list...")
2845 (let ((list (sort (all-completions pattern table) 'string<))) 2845 (let ((list (sort (all-completions pattern table) 'string<)))
2846 (with-output-to-temp-buffer "*Completions*" 2846 (with-output-to-temp-buffer "*Completions*"
2847 (display-completion-list list))) 2847 (display-completion-list list pattern)))
2848 (message "Making completion list...%s" "done")))))) 2848 (message "Making completion list...%s" "done"))))))
2849 2849
2850;;; Comments, TODO and DEADLINE 2850;;; Comments, TODO and DEADLINE