[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-subword.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/18 02:32:05

Index: cc-subword.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cc-subword.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cc-subword.el       4 Dec 2007 03:53:04 -0000       1.10
+++ cc-subword.el       18 Dec 2007 02:32:04 -0000      1.11
@@ -88,24 +88,7 @@
 (cc-require 'cc-defs)
 (cc-require 'cc-cmds)
 
-;; Don't complain about the `define-minor-mode' form if it isn't defined.
-(cc-bytecomp-defvar c-subword-mode)
-
-;; Autoload directives must be on the top level, so we construct an
-;; autoload form instead.
-;;;###autoload (autoload 'c-subword-mode "cc-subword" "Mode enabling subword 
movement and editing keys." t)
-
-(if (not (fboundp 'define-minor-mode))
-    (defun c-subword-mode ()
-      "(Missing) mode enabling subword movement and editing keys.
-This mode is not (yet) available in this version of (X)Emacs.  Sorry!  If
-you really want it, please send a request to <address@hidden>,
-telling us which (X)Emacs version you're using."
-      (interactive)
-      (error
-       "c-subword-mode is not (yet) available in this version of (X)Emacs.  
Sorry!"))
-
-  (defvar c-subword-mode-map
+(defvar c-subword-mode-map
     (let ((map (make-sparse-keymap)))
       (dolist (cmd '(forward-word backward-word mark-word
                      kill-word backward-kill-word
@@ -123,9 +106,8 @@
       map)
     "Keymap used in command `c-subword-mode' minor mode.")
 
-  ;; Produces compiler warning about make-variable-buffer-local not
-  ;; being called at toplevel (due to fboundp test).
-  (define-minor-mode c-subword-mode
+;;;###autoload
+(define-minor-mode c-subword-mode
     "Mode enabling subword movement and editing keys.
 In spite of GNU Coding Standards, it is popular to name a symbol by
 mixing uppercase and lowercase letters, e.g. \"GtkWidget\",
@@ -150,8 +132,6 @@
     c-subword-mode-map
     (c-update-modeline))
 
-  )
-
 (defun c-forward-subword (&optional arg)
   "Do the same as `forward-word' but on subwords.
 See the command `c-subword-mode' for a description of subwords.