aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/progmodes/cperl-mode.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index c0487f066a6..2a7bbf01058 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -878,8 +878,9 @@ In regular expressions (including character classes):
878(and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1) 878(and (vectorp cperl-del-back-ch) (= (length cperl-del-back-ch) 1)
879 (setq cperl-del-back-ch (aref cperl-del-back-ch 0))) 879 (setq cperl-del-back-ch (aref cperl-del-back-ch 0)))
880 880
881(defun cperl-putback-char (c) ; Emacs 19 881(defun cperl-putback-char (c)
882 (push c unread-command-events)) ; Avoid undefined warning 882 (declare (obsolete nil "29.1"))
883 (push c unread-command-events))
883 884
884(defsubst cperl-put-do-not-fontify (from to &optional post) 885(defsubst cperl-put-do-not-fontify (from to &optional post)
885 ;; If POST, do not do it with postponed fontification 886 ;; If POST, do not do it with postponed fontification
@@ -2143,7 +2144,7 @@ to nil."
2143 (delete-char -1) 2144 (delete-char -1)
2144 (delete-char 1)))) 2145 (delete-char 1))))
2145 (if delete 2146 (if delete
2146 (cperl-putback-char cperl-del-back-ch)) 2147 (push cperl-del-back-ch unread-command-events))
2147 (if cperl-message-electric-keyword 2148 (if cperl-message-electric-keyword
2148 (message "Precede char by C-q to avoid expansion")))))) 2149 (message "Precede char by C-q to avoid expansion"))))))
2149 2150
@@ -2217,7 +2218,7 @@ to nil."
2217 (end-of-line) 2218 (end-of-line)
2218 (setq really-delete t))) 2219 (setq really-delete t)))
2219 (if (and delete really-delete) 2220 (if (and delete really-delete)
2220 (cperl-putback-char cperl-del-back-ch)))))) 2221 (push cperl-del-back-ch unread-command-events))))))
2221 2222
2222(defun cperl-electric-else () 2223(defun cperl-electric-else ()
2223 "Insert a construction appropriate after a keyword. 2224 "Insert a construction appropriate after a keyword.
@@ -2254,7 +2255,7 @@ to nil."
2254 (cperl-indent-line) 2255 (cperl-indent-line)
2255 (forward-line -1) 2256 (forward-line -1)
2256 (cperl-indent-line) 2257 (cperl-indent-line)
2257 (cperl-putback-char cperl-del-back-ch) 2258 (push cperl-del-back-ch unread-command-events)
2258 (setq this-command 'cperl-electric-else) 2259 (setq this-command 'cperl-electric-else)
2259 (if cperl-message-electric-keyword 2260 (if cperl-message-electric-keyword
2260 (message "Precede char by C-q to avoid expansion")))))) 2261 (message "Precede char by C-q to avoid expansion"))))))