[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115891: * lisp/abbrev.el (define-abbrev): Beware ne
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r115891: * lisp/abbrev.el (define-abbrev): Beware new meaning of fboundp. |
Date: |
Mon, 06 Jan 2014 23:34:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115891
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-01-06 18:34:05 -0500
message:
* lisp/abbrev.el (define-abbrev): Beware new meaning of fboundp.
* lisp/emacs-lisp/elint.el (elint-find-builtins):
* lisp/emacs-lisp/eldoc.el (eldoc-symbol-function):
* lisp/emacs-lisp/bytecomp.el (byte-compile-callargs-warn)
(byte-compile-file-form-defmumble, byte-compile, byte-compile-form):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand):
* lisp/apropos.el (apropos-safe-documentation):
* lisp/subr.el (symbol-file): Remove redundant fboundp.
* lisp/progmodes/idlw-shell.el (idlwave-shell-comint-filter): Use defalias.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/abbrev.el abbrev.el-20091113204419-o5vbwnq5f7feedwu-281
lisp/apropos.el apropos.el-20091113204419-o5vbwnq5f7feedwu-273
lisp/emacs-lisp/byte-opt.el byteopt.el-20091113204419-o5vbwnq5f7feedwu-491
lisp/emacs-lisp/bytecomp.el bytecomp.el-20091113204419-o5vbwnq5f7feedwu-492
lisp/emacs-lisp/eldoc.el eldoc.el-20091113204419-o5vbwnq5f7feedwu-952
lisp/emacs-lisp/elint.el elint.el-20091113204419-o5vbwnq5f7feedwu-1240
lisp/progmodes/idlw-shell.el
idlwshell.el-20091113204419-o5vbwnq5f7feedwu-1739
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-06 20:54:37 +0000
+++ b/lisp/ChangeLog 2014-01-06 23:34:05 +0000
@@ -1,3 +1,15 @@
+2014-01-06 Stefan Monnier <address@hidden>
+
+ * abbrev.el (define-abbrev): Beware new meaning of fboundp.
+ * emacs-lisp/elint.el (elint-find-builtins):
+ * emacs-lisp/eldoc.el (eldoc-symbol-function):
+ * emacs-lisp/bytecomp.el (byte-compile-callargs-warn)
+ (byte-compile-file-form-defmumble, byte-compile, byte-compile-form):
+ * emacs-lisp/byte-opt.el (byte-compile-inline-expand):
+ * apropos.el (apropos-safe-documentation):
+ * subr.el (symbol-file): Remove redundant fboundp.
+ * progmodes/idlw-shell.el (idlwave-shell-comint-filter): Use defalias.
+
2014-01-06 Bastien Guerry <address@hidden>
* hl-line.el (global-hl-line-overlay): Make a local variable.
=== modified file 'lisp/abbrev.el'
--- a/lisp/abbrev.el 2014-01-01 07:43:34 +0000
+++ b/lisp/abbrev.el 2014-01-06 23:34:05 +0000
@@ -588,7 +588,7 @@
(boundp sym) (symbol-value sym)
(not (abbrev-get sym :system)))
(unless (or system-flag
- (and (boundp sym) (fboundp sym)
+ (and (boundp sym)
;; load-file-name
(equal (symbol-value sym) expansion)
(equal (symbol-function sym) hook)))
=== modified file 'lisp/apropos.el'
--- a/lisp/apropos.el 2014-01-01 07:43:34 +0000
+++ b/lisp/apropos.el 2014-01-06 23:34:05 +0000
@@ -1006,8 +1006,7 @@
"Like `documentation', except it avoids calling `get_doc_string'.
Will return nil instead."
(while (and function (symbolp function))
- (setq function (if (fboundp function)
- (symbol-function function))))
+ (setq function (symbol-function function)))
(if (eq (car-safe function) 'macro)
(setq function (cdr function)))
(setq function (if (byte-code-function-p function)
=== modified file 'lisp/emacs-lisp/byte-opt.el'
--- a/lisp/emacs-lisp/byte-opt.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/byte-opt.el 2014-01-06 23:34:05 +0000
@@ -248,10 +248,10 @@
(defun byte-compile-inline-expand (form)
(let* ((name (car form))
(localfn (cdr (assq name byte-compile-function-environment)))
- (fn (or localfn (and (fboundp name) (symbol-function name)))))
+ (fn (or localfn (symbol-function name))))
(when (autoloadp fn)
(autoload-do-load fn)
- (setq fn (or (and (fboundp name) (symbol-function name))
+ (setq fn (or (symbol-function name)
(cdr (assq name byte-compile-function-environment)))))
(pcase fn
(`nil
=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/bytecomp.el 2014-01-06 23:34:05 +0000
@@ -1265,8 +1265,7 @@
(if (byte-code-function-p def)
(aref def 0)
'(&rest def)))))
- (if (and (fboundp (car form))
- (subrp (symbol-function (car form))))
+ (if (subrp (symbol-function (car form)))
(subr-arity (symbol-function (car form))))))
(ncall (length (cdr form))))
;; Check many or unevalled from subr-arity.
@@ -2396,9 +2395,8 @@
(byte-compile-warn "%s `%s' defined multiple times in this file"
(if macro "macro" "function")
name)))
- ((and (fboundp name)
- (eq (car-safe (symbol-function name))
- (if macro 'lambda 'macro)))
+ ((eq (car-safe (symbol-function name))
+ (if macro 'lambda 'macro))
(when (byte-compile-warning-enabled-p 'redefine)
(byte-compile-warn "%s `%s' being redefined as a %s"
(if macro "function" "macro")
@@ -2532,7 +2530,7 @@
(byte-compile-close-variables
(let* ((lexical-binding lexical-binding)
(fun (if (symbolp form)
- (and (fboundp form) (symbol-function form))
+ (symbol-function form)
form))
(macro (eq (car-safe fun) 'macro)))
(if macro
@@ -2946,8 +2944,7 @@
(format "; use `%s' instead."
interactive-only))
(t "."))))
- (if (and (fboundp (car form))
- (eq (car-safe (symbol-function (car form))) 'macro))
+ (if (eq (car-safe (symbol-function (car form))) 'macro)
(byte-compile-log-warning
(format "Forgot to expand macro %s" (car form)) nil :error))
(if (and handler
=== modified file 'lisp/emacs-lisp/eldoc.el'
--- a/lisp/emacs-lisp/eldoc.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/eldoc.el 2014-01-06 23:34:05 +0000
@@ -512,8 +512,7 @@
;; Do indirect function resolution if possible.
(defun eldoc-symbol-function (fsym)
- (let ((defn (and (fboundp fsym)
- (symbol-function fsym))))
+ (let ((defn (symbol-function fsym)))
(and (symbolp defn)
(condition-case _
(setq defn (indirect-function fsym))
=== modified file 'lisp/emacs-lisp/elint.el'
--- a/lisp/emacs-lisp/elint.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/elint.el 2014-01-06 23:34:05 +0000
@@ -1145,8 +1145,8 @@
(defun elint-find-builtins ()
"Return a list of all built-in functions."
(let (subrs)
- (mapatoms (lambda (s) (and (fboundp s) (subrp (symbol-function s))
- (setq subrs (cons s subrs)))))
+ (mapatoms (lambda (s) (and (subrp (symbol-function s))
+ (push s subrs))))
subrs))
(defun elint-find-builtin-args (&optional list)
=== modified file 'lisp/progmodes/idlw-shell.el'
--- a/lisp/progmodes/idlw-shell.el 2014-01-01 07:43:34 +0000
+++ b/lisp/progmodes/idlw-shell.el 2014-01-06 23:34:05 +0000
@@ -1446,10 +1446,10 @@
;; Newer versions of comint.el changed the name of comint-filter to
;; comint-output-filter.
-(defun idlwave-shell-comint-filter (process string) nil)
-(if (fboundp 'comint-output-filter)
- (fset 'idlwave-shell-comint-filter (symbol-function 'comint-output-filter))
- (fset 'idlwave-shell-comint-filter (symbol-function 'comint-filter)))
+(defalias 'idlwave-shell-comint-filter
+ (if (fboundp 'comint-output-filter)
+ #'comint-output-filter
+ #'comint-filter))
(defun idlwave-shell-is-running ()
"Return t if the shell process is running."
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2014-01-06 19:29:39 +0000
+++ b/lisp/subr.el 2014-01-06 23:34:05 +0000
@@ -1810,7 +1810,7 @@
TYPE is `defun', `defvar', or `defface', that specifies function
definition, variable definition, or face definition only."
(if (and (or (null type) (eq type 'defun))
- (symbolp symbol) (fboundp symbol)
+ (symbolp symbol)
(autoloadp (symbol-function symbol)))
(nth 1 (symbol-function symbol))
(let ((files load-history)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115891: * lisp/abbrev.el (define-abbrev): Beware new meaning of fboundp.,
Stefan Monnier <=