(cperl-putback-char): Delete Emacs 18 definition.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f688890aa7155ed9b0f75611ca91c0922252338..71673e8e6c72dd55c6574cf4752c0c8453a751c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-04-21  Richard M. Stallman  <rms@gnu.org>
+
+       * progmodes/cperl-mode.el (cperl-putback-char):
+       Delete Emacs 18 definition.
+
+       * international/mule.el (ctext-post-read-conversion): 
+       Use assoc-string, not assoc-ignore-case.
+       
+       * international/mule-cmds.el: Use assoc-string, not assoc-ignore-case.
+
+       * emacs-lisp/easymenu.el (easy-menu-add):
+       Do call x-popup-menu, but only if it's defined.
+
+       * emacs-lisp/disass.el (disassemble): Handle lambda-exp as arg.
+
+       * emacs-lisp/bytecomp.el (byte-compile-no-warnings):
+       Handle multiple args: compile like progn.
+
+       * emacs-lisp/byte-run.el (with-no-warnings): Simplify:
+       take all args as &rest arg.
+
+       * autoinsert.el (auto-insert-alist): Insert the user's name in
+       copyright notice, rather than Free Software Foundation.
+
 2004-04-21  Kenichi Handa  <handa@m17n.org>
 
        * descr-text.el (describe-char): Make it work on *Help* buffer.

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index e13198fb2407dfb0792ac6b41d0778e8d6a40f03..c651e06b899261870861d5816e52a75fe6cebb8a 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -926,12 +926,9 @@ the faces: please specify bold, italic, underline, shadow and box.)
 (defun cperl-putback-char (c)          ; Emacs 19
   (set 'unread-command-events (list c))) ; Avoid undefined warning
 
-(if (boundp 'unread-command-events)
-    (if cperl-xemacs-p
-       (defun cperl-putback-char (c)   ; XEmacs >= 19.12
-         (setq unread-command-events (list (eval '(character-to-event c))))))
-  (defun cperl-putback-char (c)                ; XEmacs <= 19.11
-    (set 'unread-command-event (eval '(character-to-event c))))) ; Avoid warnings
+(if cperl-xemacs-p
+    (defun cperl-putback-char (c)      ; XEmacs >= 19.12
+      (setq unread-command-events (list (eval '(character-to-event c))))))
 
 (or (fboundp 'uncomment-region)
     (defun uncomment-region (beg end)