* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-defmacro): Remove, unused.

* lisp/progmodes/cc-vars.el (bq-process): Remove, unused.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 184356f..37a6adb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/cc-bytecomp.el (cc-bytecomp-defmacro): Remove, unused.
+       * progmodes/cc-vars.el (bq-process): Remove, unused.
+
        * emacs-lisp/cl-macs.el (cl-defstruct): Obey the :read-only property.
 
 2012-10-09  Fabián Ezequiel Gallina  <fgallina@cuca>

diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index bd98056..4236f1c 100644 (file)
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -338,30 +338,6 @@ at compile time, e.g. for macros and inline functions."
             (cc-bytecomp-debug-msg
              "cc-bytecomp-defun: Covered function %s" ',fun))))))
 
-(put 'cc-bytecomp-defmacro 'lisp-indent-function 'defun)
-(defmacro cc-bytecomp-defmacro (fun &rest temp-macro)
-  "Bind the symbol as a macro during compilation (and evaluation) of the
-file.  Don't use outside `eval-when-compile'."
-  `(let ((orig-fun (assq ',fun cc-bytecomp-original-functions)))
-     (if (not orig-fun)
-        (setq orig-fun
-              (list ',fun
-                    nil
-                    (if (fboundp ',fun)
-                        (progn
-                          (cc-bytecomp-debug-msg
-                           "cc-bytecomp-defmacro: Saving %s" ',fun)
-                          (symbol-function ',fun))
-                      (cc-bytecomp-debug-msg
-                       "cc-bytecomp-defmacro: Saving %s as unbound" ',fun)
-                      'unbound))
-              cc-bytecomp-original-functions
-              (cons orig-fun cc-bytecomp-original-functions)))
-     (defmacro ,fun ,@temp-macro)
-     (cc-bytecomp-debug-msg
-      "cc-bytecomp-defmacro: Bound macro %s" ',fun)
-     (setcar (cdr orig-fun) (symbol-function ',fun))))
-
 (defmacro cc-bytecomp-put (symbol propname value)
   "Set a property on a symbol during compilation (and evaluation) of
 the file.  Don't use outside `eval-when-compile'."

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 5201e4a..d56c112 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -49,16 +49,6 @@
   (require 'custom)
   (require 'widget))
 
-(cc-eval-when-compile
-  ;; Need the function form of `backquote', which isn't standardized
-  ;; between Emacsen.  It's called `bq-process' in XEmacs, and
-  ;; `backquote-process' in Emacs.  `backquote-process' returns a
-  ;; slightly more convoluted form, so let `bq-process' be the norm.
-  (if (fboundp 'backquote-process)
-      (cc-bytecomp-defmacro bq-process (form)
-       `(cdr (backquote-process ,form)))))
-
-\f
 ;;; Helpers
 
 ;; This widget exists in newer versions of the Custom library