aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-03-24 12:44:46 +0000
committerStefan Monnier2005-03-24 12:44:46 +0000
commita702ffbb9956f5363315be065d4ea264ffbda744 (patch)
tree2590ed1399f9ed52286411023385cf713ff74358
parent486212810f017c49c1bd3b58e8998d1378c8e628 (diff)
downloademacs-a702ffbb9956f5363315be065d4ea264ffbda744.tar.gz
emacs-a702ffbb9956f5363315be065d4ea264ffbda744.zip
find-file-hooks -> find-file-hook.
-rw-r--r--lisp/ChangeLog20
-rw-r--r--lisp/autoinsert.el13
2 files changed, 21 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cfbedd5a77..31ff2581e5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-03-24 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * autoinsert.el: find-file-hooks -> find-file-hook.
4
12005-03-24 Lute Kamstra <lute@gnu.org> 52005-03-24 Lute Kamstra <lute@gnu.org>
2 6
3 * generic.el (generic-font-lock-defaults): Make it obsolete. 7 * generic.el (generic-font-lock-defaults): Make it obsolete.
@@ -20,6 +24,11 @@
20 * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): 24 * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
21 Recognize define-generic-mode. 25 Recognize define-generic-mode.
22 26
272005-03-23 Stefan Monnier <monnier@iro.umontreal.ca>
28
29 * icomplete.el (icomplete-simple-completing-p): Don't turn on icomplete
30 if there's no completion table.
31
232005-03-23 Miles Bader <miles@gnu.org> 322005-03-23 Miles Bader <miles@gnu.org>
24 33
25 * progmodes/gdb-ui.el (breakpoint-enabled, breakpoint-disabled): 34 * progmodes/gdb-ui.el (breakpoint-enabled, breakpoint-disabled):
@@ -27,8 +36,7 @@
27 36
282005-03-23 Lute Kamstra <lute@gnu.org> 372005-03-23 Lute Kamstra <lute@gnu.org>
29 38
30 * generic-x.el: Code cleanup: make arguments constant whenever 39 * generic-x.el: Code cleanup: make args constant whenever possible.
31 possible.
32 (installshield-statement-keyword-list) 40 (installshield-statement-keyword-list)
33 (installshield-system-functions-list) 41 (installshield-system-functions-list)
34 (installshield-system-variables-list, installshield-types-list) 42 (installshield-system-variables-list, installshield-types-list)
@@ -36,8 +44,8 @@
36 44
37 * generic.el (generic-make-keywords-list): Add autoload cookie. 45 * generic.el (generic-make-keywords-list): Add autoload cookie.
38 46
39 * calendar/time-date.el: Add comment on time value formats. Don't 47 * calendar/time-date.el: Add comment on time value formats.
40 require parse-time. 48 Don't require parse-time.
41 (with-decoded-time-value): New macro. 49 (with-decoded-time-value): New macro.
42 (encode-time-value): New function. 50 (encode-time-value): New function.
43 (time-to-seconds, time-less-p, time-subtract, time-add): Use them. 51 (time-to-seconds, time-less-p, time-subtract, time-add): Use them.
@@ -56,8 +64,8 @@
56 (recentf-include-p): More robust. 64 (recentf-include-p): More robust.
57 (recentf-keep-p): New function. 65 (recentf-keep-p): New function.
58 (recentf-remove-if-non-kept): Rename from 66 (recentf-remove-if-non-kept): Rename from
59 `recentf-remove-if-non-readable'. Use `recentf-keep-p'. All 67 `recentf-remove-if-non-readable'. Use `recentf-keep-p'.
60 callers updated. 68 All callers updated.
61 (recentf-menu-items-for-commands): Fix help string. 69 (recentf-menu-items-for-commands): Fix help string.
62 (recentf-track-closed-file): Update. Doc fix. 70 (recentf-track-closed-file): Update. Doc fix.
63 (recentf-cleanup): Update. Count removed files. Doc fix. 71 (recentf-cleanup): Update. Count removed files. Doc fix.
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index ea3df8efa68..27f5555bb04 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,6 +1,7 @@
1;;; autoinsert.el --- automatic mode-dependent insertion of text into new files 1;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
2 2
3;; Copyright (C) 1985, 86, 87, 94, 95, 98, 2000, 03 Free Software Foundation, Inc. 3;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2003, 2005
4;; Free Software Foundation, Inc.
4 5
5;; Author: Charlie Martin <crm@cs.duke.edu> 6;; Author: Charlie Martin <crm@cs.duke.edu>
6;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org> 7;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
@@ -33,7 +34,7 @@
33;; auto-mode-alist. 34;; auto-mode-alist.
34;; 35;;
35;; To use: 36;; To use:
36;; (add-hook 'find-file-hooks 'auto-insert) 37;; (add-hook 'find-file-hook 'auto-insert)
37;; setq auto-insert-directory to an appropriate slash-terminated value 38;; setq auto-insert-directory to an appropriate slash-terminated value
38;; 39;;
39;; You can also customize the variable `auto-insert-mode' to load the 40;; You can also customize the variable `auto-insert-mode' to load the
@@ -67,7 +68,7 @@ Insertion is possible when something appropriate is found in
67`auto-insert-alist'. When the insertion is marked as unmodified, you can 68`auto-insert-alist'. When the insertion is marked as unmodified, you can
68save it with \\[write-file] RET. 69save it with \\[write-file] RET.
69This variable is used when the function `auto-insert' is called, e.g. 70This variable is used when the function `auto-insert' is called, e.g.
70when you do (add-hook 'find-file-hooks 'auto-insert). 71when you do (add-hook 'find-file-hook 'auto-insert).
71With \\[auto-insert], this is always treated as if it were t." 72With \\[auto-insert], this is always treated as if it were t."
72 :type '(choice (const :tag "Insert if possible" t) 73 :type '(choice (const :tag "Insert if possible" t)
73 (const :tag "Do nothing" nil) 74 (const :tag "Do nothing" nil)
@@ -326,10 +327,10 @@ When Auto-insert mode is enabled, when new files are created you can
326insert a template for the file depending on the mode of the buffer." 327insert a template for the file depending on the mode of the buffer."
327 :global t :group 'auto-insert 328 :global t :group 'auto-insert
328 (if auto-insert-mode 329 (if auto-insert-mode
329 (add-hook 'find-file-hooks 'auto-insert) 330 (add-hook 'find-file-hook 'auto-insert)
330 (remove-hook 'find-file-hooks 'auto-insert))) 331 (remove-hook 'find-file-hook 'auto-insert)))
331 332
332(provide 'autoinsert) 333(provide 'autoinsert)
333 334
334;;; arch-tag: 5b6630ac-c735-43cf-b097-b78c622af909 335;; arch-tag: 5b6630ac-c735-43cf-b097-b78c622af909
335;;; autoinsert.el ends here 336;;; autoinsert.el ends here