aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-12-02 21:12:28 +0000
committerStefan Monnier2005-12-02 21:12:28 +0000
commit21b15ee87ea34f05f65e579302103336d74e59e3 (patch)
tree62d9b4518240f9e6e9a8df85550afa9376941709
parent61322d728601751719095018369ab53e68da31cd (diff)
downloademacs-21b15ee87ea34f05f65e579302103336d74e59e3.tar.gz
emacs-21b15ee87ea34f05f65e579302103336d74e59e3.zip
(save-completions-file-name): Fix typo in last change.
-rw-r--r--lisp/ChangeLog22
-rw-r--r--lisp/completion.el3
2 files changed, 13 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6be44fab995..0b029e203df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-12-02 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * completion.el (save-completions-file-name): Fix typo in last change.
4
12005-12-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52005-12-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * info.el: Move back/forward history to the beginning of the tool bar. 7 * info.el: Move back/forward history to the beginning of the tool bar.
@@ -12,11 +16,9 @@
12 lack the definition. 16 lack the definition.
13 (allout-mode): Move this variable above any uses, or byte 17 (allout-mode): Move this variable above any uses, or byte
14 compilation will fail. 18 compilation will fail.
15 (allout-resolve-xref): Remove use of personal file-reference 19 (allout-resolve-xref): Remove use of personal file-reference function.
16 function.
17 (allout-toggle-current-subtree-encryption): Do the current (ie, 20 (allout-toggle-current-subtree-encryption): Do the current (ie,
18 visible containing) topic, rather than nearest around point. Doc 21 visible containing) topic, rather than nearest around point. Doc fix.
19 fix.
20 (allout-toggle-subtree-encryption): New function, workhorse that 22 (allout-toggle-subtree-encryption): New function, workhorse that
21 works on nearest topic containing point. 23 works on nearest topic containing point.
22 (allout-encrypt-string): Signal requirement for newer version of pgg. 24 (allout-encrypt-string): Signal requirement for newer version of pgg.
@@ -28,21 +30,20 @@
28 30
292005-12-02 Agustin Martin <agustin.martin@hispalinux.es> 312005-12-02 Agustin Martin <agustin.martin@hispalinux.es>
30 32
31 * textmodes/flyspell.el (flyspell-external-point-words): Consider 33 * textmodes/flyspell.el (flyspell-external-point-words):
32 a misspelling as found in the string search if: (a) misspelling 34 Consider a misspelling as found in the string search if: (a) misspelling
33 and found string lengths match, or (b) misspelling is found as 35 and found string lengths match, or (b) misspelling is found as
34 element in a boundary-chars separated longer string, or (c) 36 element in a boundary-chars separated longer string, or (c)
35 ispell-program-name is really ispell and misspelling is found as 37 ispell-program-name is really ispell and misspelling is found as
36 part of a TeX string. After successful match move beginning of 38 part of a TeX string. After successful match move beginning of
37 search region to end of match. Warn about not found misspellings 39 search region to end of match. Warn about not found misspellings
38 once the process is done. 40 once the process is done.
39 (flyspell-large-region) Do not set ispell-parser to tex if in TeX 41 (flyspell-large-region): Do not set ispell-parser to tex if in TeX mode.
40 mode.
41 42
422005-12-02 Nick Roberts <nickrob@snap.net.nz> 432005-12-02 Nick Roberts <nickrob@snap.net.nz>
43 44
44 * progmodes/gud.el (gud-menu-map): Put gud-finish back on the 45 * progmodes/gud.el (gud-menu-map): Put gud-finish back on the
45 tool bar (removed inadvertantly), 46 tool bar (removed inadvertently).
46 47
472005-12-02 Juri Linkov <juri@jurta.org> 482005-12-02 Juri Linkov <juri@jurta.org>
48 49
@@ -56,8 +57,7 @@
562005-12-01 Luc Teirlinck <teirllm@auburn.edu> 572005-12-01 Luc Teirlinck <teirllm@auburn.edu>
57 58
58 * simple.el (transient-mark-mode, line-number-mode) 59 * simple.el (transient-mark-mode, line-number-mode)
59 (column-number-mode, size-indication-mode): Remove 60 (column-number-mode, size-indication-mode): Remove `:require nil'.
60 `:require nil'.
61 61
622005-12-01 Nick Roberts <nickrob@snap.net.nz> 622005-12-01 Nick Roberts <nickrob@snap.net.nz>
63 63
diff --git a/lisp/completion.el b/lisp/completion.el
index 2cd30e6513f..28bf1dd10b9 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -302,7 +302,8 @@ See also `save-completions-retention-time'."
302 (cond 302 (cond
303 ((file-readable-p olddef) olddef) 303 ((file-readable-p olddef) olddef)
304 ((file-directory-p (convert-standard-filename "~/.emacs.d/")) 304 ((file-directory-p (convert-standard-filename "~/.emacs.d/"))
305 (convert-standard-filename (expand-file-name completions "~/.emacs.d/"))) 305 (convert-standard-filename
306 (expand-file-name "completions" "~/.emacs.d/")))
306 (t olddef))) 307 (t olddef)))
307 "The filename to save completions to." 308 "The filename to save completions to."
308 :type 'file 309 :type 'file