From 02c992ecf3673396af52cb51dd31e91baee24833 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 1 Jun 2013 13:08:52 -0700 Subject: [PATCH] Plain boundp silences compilation warnings since Emacs 22.1. * progmodes/cc-defs.el (zmacs-region-stays, zmacs-regions) (lookup-syntax-properties): Remove unecessary cc-bytecomp-defvar. --- lisp/ChangeLog | 4 +++- lisp/progmodes/cc-defs.el | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 35e1daddc4..a7ac80ad77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,6 @@ 2013-06-01 Glenn Morris - Plain fboundp silences compilation warnings since Emacs 22.1. + Plain (f)boundp silences compilation warnings since Emacs 22.1. * progmodes/cc-cmds.el (delete-forward-p): * progmodes/cc-defs.el (buffer-syntactic-context-depth): * progmodes/cc-engine.el (buffer-syntactic-context): @@ -9,6 +9,8 @@ * progmodes/cc-vars.el (get-char-table): No need for cc-bytecomp-defun. * progmodes/cc-defs.el (c-set-region-active, c-beginning-of-defun-1) * progmodes/cc-mode.el (c-make-inherited-keymap): Use plain fboundp. + * progmodes/cc-defs.el (zmacs-region-stays, zmacs-regions) + (lookup-syntax-properties): Remove unecessary cc-bytecomp-defvar. * progmodes/cc-vars.el (other): Emacs has this widget since at least 21.1, so don't (re)define it. diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 7933324816..b90a01dcb3 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -49,14 +49,11 @@ ;; Silence the compiler. (cc-bytecomp-defvar c-enable-xemacs-performance-kludge-p) ; In cc-vars.el (cc-bytecomp-defun region-active-p) ; XEmacs -(cc-bytecomp-defvar zmacs-region-stays) ; XEmacs -(cc-bytecomp-defvar zmacs-regions) ; XEmacs (cc-bytecomp-defvar mark-active) ; Emacs (cc-bytecomp-defvar deactivate-mark) ; Emacs (cc-bytecomp-defvar inhibit-point-motion-hooks) ; Emacs (cc-bytecomp-defvar parse-sexp-lookup-properties) ; Emacs (cc-bytecomp-defvar text-property-default-nonsticky) ; Emacs 21 -(cc-bytecomp-defvar lookup-syntax-properties) ; XEmacs (cc-bytecomp-defun string-to-syntax) ; Emacs 21 @@ -1607,7 +1604,7 @@ non-nil, a caret is prepended to invert the set." (let ((buf (generate-new-buffer " test")) parse-sexp-lookup-properties parse-sexp-ignore-comments - lookup-syntax-properties) + lookup-syntax-properties) ; XEmacs (with-current-buffer buf (set-syntax-table (make-syntax-table)) -- 2.20.1