aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-05-21 04:55:51 +0000
committerRichard M. Stallman2005-05-21 04:55:51 +0000
commita527b753609d18258a4d9fdc49e5a94ca3dc5fba (patch)
treee48c28f9d4fccbb14a52e2992bc403e8608d0874
parentadf8a02eb3d00c38ec0252d0344835a1f90ac74d (diff)
downloademacs-a527b753609d18258a4d9fdc49e5a94ca3dc5fba.tar.gz
emacs-a527b753609d18258a4d9fdc49e5a94ca3dc5fba.zip
(idlwave-doc-header): Use insert-file-contents.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/progmodes/idlwave.el2
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65fd9a68889..805402db2a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12005-05-21 Richard M. Stallman <rms@gnu.org>
2
3 * progmodes/idlwave.el (idlwave-doc-header): Use insert-file-contents.
4
5 * progmodes/flymake.el (flymake-makehash): Use with-no-warnings.
6
7 * net/rcompile.el (remote-compile): Use compilation-start.
8
9 * tmm.el (tmm-shortcut): Avoid using beginning-of-buffer.
10
12005-05-21 Daniel Pfeiffer <occitan@esperanto.org> 112005-05-21 Daniel Pfeiffer <occitan@esperanto.org>
2 12
3 * files.el (auto-mode-alist): Check GNUmakefile before makefile. 13 * files.el (auto-mode-alist): Check GNUmakefile before makefile.
@@ -149,6 +159,7 @@
149 (left-fringe-p): Function deleted. 159 (left-fringe-p): Function deleted.
150 160
151 * buff-menu.el (Buffer-menu-buffer-face): In group Buffer-menu. 161 * buff-menu.el (Buffer-menu-buffer-face): In group Buffer-menu.
162 (list-buffers-noselect): Set `font-lock-face' property, not `face'.
152 163
153 * dired-aux.el (dired-copy-file-recursive): Handle symlinks 164 * dired-aux.el (dired-copy-file-recursive): Handle symlinks
154 in recursive copy. 165 in recursive copy.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 35e4b68c9b8..a118b0055a9 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -3548,7 +3548,7 @@ is non-nil."
3548 (let ((pos (point))) 3548 (let ((pos (point)))
3549 (if idlwave-file-header 3549 (if idlwave-file-header
3550 (cond ((car idlwave-file-header) 3550 (cond ((car idlwave-file-header)
3551 (insert-file (car idlwave-file-header))) 3551 (insert-file-contents (car idlwave-file-header)))
3552 ((stringp (car (cdr idlwave-file-header))) 3552 ((stringp (car (cdr idlwave-file-header)))
3553 (insert (car (cdr idlwave-file-header)))))) 3553 (insert (car (cdr idlwave-file-header))))))
3554 (goto-char pos))) 3554 (goto-char pos)))