diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/cedet/mode-local.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 3 | ||||
| -rw-r--r-- | lisp/help-fns.el | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 4f424313ab7..71e146880b1 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -31,7 +31,7 @@ ;; This library permits the setting of override functions for tasks of ;; that nature, and also provides reasonable defaults. ;; -;; There are buffer local variables, and frame local variables. +;; There are buffer local variables (and there were frame local variables). ;; This library gives the illusion of mode specific variables. ;; ;; You should use a mode-local variable or override to allow extension diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 66117b83316..04a493c826f 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -2170,8 +2170,7 @@ The purpose of this function is so you can properly undo subsequent changes to the same binding, by passing the status cons cell to `edebug-restore-status'. The status cons cell has the form (LOCUS . VALUE), where LOCUS can be a buffer -\(for a buffer-local binding), a frame (for a frame-local binding), -or nil (if the default binding is current)." +\(for a buffer-local binding), or nil (if the default binding is current)." (cons (variable-binding-locus var) (symbol-value var))) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 23dec896b81..6402f770927 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -863,8 +863,6 @@ it is displayed along with the global value." ((bufferp locus) (princ (format "Local in buffer %s; " (buffer-name buffer)))) - ((framep locus) - (princ (format "It is a frame-local variable; "))) ((terminal-live-p locus) (princ (format "It is a terminal-local variable; "))) (t diff --git a/lisp/subr.el b/lisp/subr.el index 99b142993fc..89ceb9ba55f 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1310,8 +1310,7 @@ be a list of the form returned by `event-start' and `event-end'." (make-obsolete 'focus-frame "it does nothing." "22.1") (defalias 'unfocus-frame 'ignore "") (make-obsolete 'unfocus-frame "it does nothing." "22.1") -(make-obsolete 'make-variable-frame-local - "explicitly check for a frame-parameter instead." "22.2") + (set-advertised-calling-convention 'all-completions '(string collection &optional predicate) "23.1") (set-advertised-calling-convention 'unintern '(name obarray) "23.3") |