diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/erc-menu.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cfengine.el | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index 0e334e93bd9..d76e0a345ef 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -110,11 +110,11 @@ ERC menu yet.") (define-erc-module menu nil "Enable a menu in ERC buffers." ((unless erc-menu-defined - ;; make sure the menu only gets defined once, since Emacs 22 + ;; make sure the menu only gets defined once, since Emacs ;; activates it immediately (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition) (setq erc-menu-defined t))) - (;; `easy-menu-remove' is a no-op in Emacs 22 + (;; `easy-menu-remove' is a no-op in Emacs (message "You might have to restart Emacs to remove the ERC menu"))) (defun erc-menu-add () diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index bef99f2484b..472788d18e5 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -987,13 +987,11 @@ Intended as the value of `indent-line-function'." (if (> (- (point-max) pos) (point)) (goto-char (- (point-max) pos))))) -;; This doesn't work too well in Emacs 21.2. See 22.1 development -;; code. (defun cfengine-fill-paragraph (&optional justify) "Fill `paragraphs' in Cfengine code." (interactive "P") (or (if (fboundp 'fill-comment-paragraph) - (fill-comment-paragraph justify) ; post Emacs 21.3 + (fill-comment-paragraph justify) ;; else do nothing in a comment (nth 4 (parse-partial-sexp (save-excursion (beginning-of-defun) |