summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/comp.el2
-rw-r--r--lisp/emacs-lisp/easy-mmode.el3
-rw-r--r--lisp/emacs-lisp/rmc.el7
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 032e49840a8..6c56fd78859 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1055,7 +1055,7 @@ If DST-N is specified, use it; otherwise assume it to be the current slot."
"Set constant VAL to current slot."
(comp--add-const-to-relocs val)
;; Leave relocation index nil on purpose, will be fixed-up in final
- ;; by `comp-finalize-relocs'.
+ ;; by `comp--finalize-relocs'.
(comp--emit `(setimm ,(comp--slot) ,val)))
(defun comp--make-curr-block (block-name entry-sp &optional addr)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 12712cb2bc3..7006ae6c785 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -524,7 +524,8 @@ on if the hook has explicitly disabled it.
(progn
(put ',global-mode 'globalized-minor-mode t)
:autoload-end
- (defvar-local ,MODE-major-mode nil))
+ (defvar-local ,MODE-major-mode nil)
+ ,@(when predicate `((defvar ,MODE-predicate))))
;; The actual global minor-mode
(define-minor-mode ,global-mode
,(concat (format "Toggle %s in all buffers.\n" pretty-name)
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index dab119e8a99..1260b50b0c7 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -228,10 +228,9 @@ Usage example:
(when (setq command
(let ((current-key-remap-sequence
(vector tchar)))
- ;; Provide an empty prompt to `t-s-t-t' so
- ;; that it may not repeatedly display
- ;; and/or disable the on-screen keyboard,
- ;; or move point.
+ ;; Provide an empty prompt so that it may
+ ;; not repeatedly display and/or disable
+ ;; the on-screen keyboard, or move point.
(touch-screen-translate-touch "")))
(setq command (if (> (length command) 0)
(aref command 0)