diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eieio-core.el | 13 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/regexp-opt.el | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 3b07c5dec4b..c47f7f943a2 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -219,7 +219,8 @@ It creates an autoload function for CNAME's constructor." ;; turn this into a usable self-pointing symbol (when eieio-backward-compatibility (set cname cname) - (make-obsolete-variable cname (format "use '%s instead" cname) "25.1")) + (make-obsolete-variable cname (format "use \\='%s instead" cname) + "25.1")) ;; Store the new class vector definition into the symbol. We need to ;; do this first so that we can call defmethod for the accessor. @@ -338,7 +339,8 @@ See `defclass' for more information." ;; turn this into a usable self-pointing symbol; FIXME: Why? (when eieio-backward-compatibility (set cname cname) - (make-obsolete-variable cname (format "use '%s instead" cname) "25.1")) + (make-obsolete-variable cname (format "use \\='%s instead" cname) + "25.1")) ;; Create a handy list of the class test too (when eieio-backward-compatibility @@ -357,8 +359,9 @@ See `defclass' for more information." (object-of-class-p (car obj) ,cname))) (setq obj (cdr obj))) ans)))) - (make-obsolete csym (format "use (cl-typep ... '(list-of %s)) instead" - cname) + (make-obsolete csym (format + "use (cl-typep ... \\='(list-of %s)) instead" + cname) "25.1"))) ;; Before adding new slots, let's add all the methods and classes @@ -407,7 +410,7 @@ See `defclass' for more information." (progn (set initarg initarg) (make-obsolete-variable - initarg (format "use '%s instead" initarg) "25.1")))) + initarg (format "use \\='%s instead" initarg) "25.1")))) ;; The customgroup should be a list of symbols. (cond ((and (null customg) custom) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index ad178c3a2c2..23203003d07 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -235,7 +235,8 @@ This method is obsolete." (let ((f (intern (format "%s-child-p" name)))) `((defalias ',f ',testsym2) (make-obsolete - ',f ,(format "use (cl-typep ... '%s) instead" name) "25.1")))) + ',f ,(format "use (cl-typep ... \\='%s) instead" name) + "25.1")))) ;; When using typep, (typep OBJ 'myclass) returns t for objects which ;; are subclasses of myclass. For our predicates, however, it is diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 7c4f21f603b..d4a2f029988 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -234,7 +234,7 @@ of it available such that: This variable has three possible values: nil: no packages are hidden; - archive: only criteria (a) is used; + `archive': only criteria (a) is used; t: both criteria are used. This variable has no effect if `package-menu--hide-packages' is diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index b0fb23dbcc9..9888e920219 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -92,7 +92,7 @@ is enclosed by at least one regexp grouping construct. The returned regexp is typically more efficient than the equivalent regexp: (let ((open (if PAREN \"\\\\(\" \"\")) (close (if PAREN \"\\\\)\" \"\"))) - (concat open (mapconcat 'regexp-quote STRINGS \"\\\\|\") close)) + (concat open (mapconcat \\='regexp-quote STRINGS \"\\\\|\") close)) If PAREN is `words', then the resulting regexp is additionally surrounded by \\=\\< and \\>. |