[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112815: Plain fboundp silences compi
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112815: Plain fboundp silences compilation warnings since Emacs 22.1 |
Date: |
Sat, 01 Jun 2013 11:19:29 -0700 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112815
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-06-01 11:19:29 -0700
message:
Plain fboundp 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):
* progmodes/cc-fonts.el (face-property-instance):
* progmodes/cc-mode.el (set-keymap-parents):
* 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.
modified:
lisp/ChangeLog
lisp/progmodes/cc-cmds.el
lisp/progmodes/cc-defs.el
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-fonts.el
lisp/progmodes/cc-mode.el
lisp/progmodes/cc-vars.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-06-01 18:06:56 +0000
+++ b/lisp/ChangeLog 2013-06-01 18:19:29 +0000
@@ -1,5 +1,15 @@
2013-06-01 Glenn Morris <address@hidden>
+ Plain fboundp 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):
+ * progmodes/cc-fonts.el (face-property-instance):
+ * progmodes/cc-mode.el (set-keymap-parents):
+ * 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-vars.el (other): Emacs has this widget since
at least 21.1, so don't (re)define it.
=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2013-03-04 19:33:23 +0000
+++ b/lisp/progmodes/cc-cmds.el 2013-06-01 18:19:29 +0000
@@ -45,7 +45,6 @@
(cc-require 'cc-engine)
;; Silence the compiler.
-(cc-bytecomp-defun delete-forward-p) ; XEmacs
(cc-bytecomp-defvar filladapt-mode) ; c-fill-paragraph contains a kludge
; which looks at this.
=== modified file 'lisp/progmodes/cc-defs.el'
--- a/lisp/progmodes/cc-defs.el 2013-05-05 12:17:12 +0000
+++ b/lisp/progmodes/cc-defs.el 2013-06-01 18:19:29 +0000
@@ -48,7 +48,6 @@
;; Silence the compiler.
(cc-bytecomp-defvar c-enable-xemacs-performance-kludge-p) ; In cc-vars.el
-(cc-bytecomp-defun buffer-syntactic-context-depth) ; XEmacs
(cc-bytecomp-defun region-active-p) ; XEmacs
(cc-bytecomp-defvar zmacs-region-stays) ; XEmacs
(cc-bytecomp-defvar zmacs-regions) ; XEmacs
@@ -334,6 +333,8 @@
(defmacro c-region-is-active-p ()
;; Return t when the region is active. The determination of region
;; activeness is different in both Emacs and XEmacs.
+ ;; FIXME? Emacs has region-active-p since 23.1, so maybe this test
+ ;; should be updated.
(if (cc-bytecomp-boundp 'mark-active)
;; Emacs.
'mark-active
@@ -343,7 +344,7 @@
(defmacro c-set-region-active (activate)
;; Activate the region if ACTIVE is non-nil, deactivate it
;; otherwise. Covers the differences between Emacs and XEmacs.
- (if (cc-bytecomp-fboundp 'zmacs-activate-region)
+ (if (fboundp 'zmacs-activate-region)
;; XEmacs.
`(if ,activate
(zmacs-activate-region)
@@ -707,9 +708,9 @@
;; `c-parse-state'.
`(progn
- (if (and ,(cc-bytecomp-fboundp 'buffer-syntactic-context-depth)
+ (if (and ,(fboundp 'buffer-syntactic-context-depth)
c-enable-xemacs-performance-kludge-p)
- ,(when (cc-bytecomp-fboundp 'buffer-syntactic-context-depth)
+ ,(when (fboundp 'buffer-syntactic-context-depth)
;; XEmacs only. This can improve the performance of
;; c-parse-state to between 3 and 60 times faster when
;; braces are hung. It can also degrade performance by
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2013-04-30 16:19:14 +0000
+++ b/lisp/progmodes/cc-engine.el 2013-06-01 18:19:29 +0000
@@ -147,9 +147,6 @@
(cc-require-when-compile 'cc-langs)
(cc-require 'cc-vars)
-;; Silence the compiler.
-(cc-bytecomp-defun buffer-syntactic-context) ; XEmacs
-
;; Make declarations for all the `c-lang-defvar' variables in cc-langs.
=== modified file 'lisp/progmodes/cc-fonts.el'
--- a/lisp/progmodes/cc-fonts.el 2013-04-03 17:50:39 +0000
+++ b/lisp/progmodes/cc-fonts.el 2013-06-01 18:19:29 +0000
@@ -176,7 +176,6 @@
'font-lock-negation-char-face))
(cc-bytecomp-defun face-inverse-video-p) ; Only in Emacs.
-(cc-bytecomp-defun face-property-instance) ; Only in XEmacs.
(defun c-make-inverse-face (oldface newface)
;; Emacs and XEmacs have completely different face manipulation
=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2013-05-30 23:18:39 +0000
+++ b/lisp/progmodes/cc-mode.el 2013-06-01 18:19:29 +0000
@@ -97,7 +97,6 @@
;; Silence the compiler.
(cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs
-(cc-bytecomp-defun set-keymap-parents) ; XEmacs
(cc-bytecomp-defun run-mode-hooks) ; Emacs 21.1
;; We set these variables during mode init, yet we don't require
@@ -212,7 +211,7 @@
((cc-bytecomp-fboundp 'set-keymap-parent)
(set-keymap-parent map c-mode-base-map))
;; XEmacs
- ((cc-bytecomp-fboundp 'set-keymap-parents)
+ ((fboundp 'set-keymap-parents)
(set-keymap-parents map c-mode-base-map))
;; incompatible
(t (error "CC Mode is incompatible with this version of Emacs")))
=== modified file 'lisp/progmodes/cc-vars.el'
--- a/lisp/progmodes/cc-vars.el 2013-06-01 18:06:56 +0000
+++ b/lisp/progmodes/cc-vars.el 2013-06-01 18:19:29 +0000
@@ -42,9 +42,6 @@
(cc-require 'cc-defs)
-;; Silence the compiler.
-(cc-bytecomp-defun get-char-table) ; XEmacs
-
(cc-eval-when-compile
(require 'custom)
(require 'widget))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112815: Plain fboundp silences compilation warnings since Emacs 22.1,
Glenn Morris <=