[Emacs-diffs] Changes to emacs/lispref/modes.texi

[Juanma Barranquero]

Index: emacs/lispref/modes.texi
diff -c emacs/lispref/modes.texi:1.51 emacs/lispref/modes.texi:1.52
*** emacs/lispref/modes.texi:1.51       Sat Dec  7 06:34:00 2002
--- emacs/lispref/modes.texi    Tue Feb  4 09:47:54 2003
***************
*** 1,7 ****
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
! @c   Free Software Foundation, Inc. 
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/modes
  @node Modes, Documentation,  Keymaps, Top
--- 1,7 ----
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
! @c   Free Software Foundation, Inc.
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/modes
  @node Modes, Documentation,  Keymaps, Top
***************
*** 99,105 ****
  * Example Major Modes::     Text mode and Lisp modes.
  * Auto Major Mode::         How Emacs chooses the major mode automatically.
  * Mode Help::               Finding out how to use a mode.
! * Derived Modes::           Defining a new major mode based on another major 
                                mode.
  @end menu
  
--- 99,105 ----
  * Example Major Modes::     Text mode and Lisp modes.
  * Auto Major Mode::         How Emacs chooses the major mode automatically.
  * Mode Help::               Finding out how to use a mode.
! * Derived Modes::           Defining a new major mode based on another major
                                mode.
  @end menu
  
***************
*** 253,259 ****
  would affect buffers that do not use this mode.  It is undesirable for a
  mode to have such global effects.  @xref{Buffer-Local Variables}.
  
! With rare exceptions, the only reasonable way to use 
  @code{make-variable-buffer-local} in a Lisp package is for a variable
  which is used only within that package.  Using it on a variable used by
  other packages would interfere with them.
--- 253,259 ----
  would affect buffers that do not use this mode.  It is undesirable for a
  mode to have such global effects.  @xref{Buffer-Local Variables}.
  
! With rare exceptions, the only reasonable way to use
  @code{make-variable-buffer-local} in a Lisp package is for a variable
  which is used only within that package.  Using it on a variable used by
  other packages would interfere with them.
***************
*** 324,330 ****
  @smallexample
  @group
  ;; @r{Create mode-specific tables.}
! (defvar text-mode-syntax-table nil 
    "Syntax table used while in text mode.")
  @end group
  
--- 324,330 ----
  @smallexample
  @group
  ;; @r{Create mode-specific tables.}
! (defvar text-mode-syntax-table nil
    "Syntax table used while in text mode.")
  @end group
  
***************
*** 403,409 ****
  @smallexample
  @group
  ;; @r{Create mode-specific table variables.}
! (defvar lisp-mode-syntax-table nil "")  
  (defvar emacs-lisp-mode-syntax-table nil "")
  (defvar lisp-mode-abbrev-table nil "")
  @end group
--- 403,409 ----
  @smallexample
  @group
  ;; @r{Create mode-specific table variables.}
! (defvar lisp-mode-syntax-table nil "")
  (defvar emacs-lisp-mode-syntax-table nil "")
  (defvar lisp-mode-abbrev-table nil "")
  @end group
***************
*** 419,425 ****
        ;; @r{Set syntax of chars up to 0 to class of chars that are}
        ;;   @r{part of symbol names but not words.}
        ;;   @r{(The number 0 is @code{48} in the @sc{ascii} character set.)}
!       (while (< i ?0) 
          (modify-syntax-entry i "_   " emacs-lisp-mode-syntax-table)
          (setq i (1+ i)))
        @dots{}
--- 419,425 ----
        ;; @r{Set syntax of chars up to 0 to class of chars that are}
        ;;   @r{part of symbol names but not words.}
        ;;   @r{(The number 0 is @code{48} in the @sc{ascii} character set.)}
!       (while (< i ?0)
          (modify-syntax-entry i "_   " emacs-lisp-mode-syntax-table)
          (setq i (1+ i)))
        @dots{}
***************
*** 513,519 ****
  @end smallexample
  
    Finally, here is the complete major mode function definition for
! Lisp mode.  
  
  @smallexample
  @group
--- 513,519 ----
  @end smallexample
  
    Finally, here is the complete major mode function definition for
! Lisp mode.
  
  @smallexample
  @group
***************
*** 601,607 ****
  How Major Modes are Chosen, emacs, The GNU Emacs Manual}.
  @end defun
  
! @defopt default-major-mode 
  This variable holds the default major mode for new buffers.  The
  standard value is @code{fundamental-mode}.
  
--- 601,607 ----
  How Major Modes are Chosen, emacs, The GNU Emacs Manual}.
  @end defun
  
! @defopt default-major-mode
  This variable holds the default major mode for new buffers.  The
  standard value is @code{fundamental-mode}.
  
***************
*** 649,655 ****
  @end group
  @group
   ("\\.el\\'" . emacs-lisp-mode)
!  ("\\.c\\'" . c-mode) 
   ("\\.h\\'" . c-mode)
   @dots{})
  @end group
--- 649,655 ----
  @end group
  @group
   ("\\.el\\'" . emacs-lisp-mode)
!  ("\\.c\\'" . c-mode)
   ("\\.h\\'" . c-mode)
   @dots{})
  @end group
***************
*** 675,685 ****
  @smallexample
  @group
  (setq auto-mode-alist
!   (append 
     ;; @r{File name (within directory) starts with a dot.}
!    '(("/\\.[^/]*\\'" . fundamental-mode)  
       ;; @r{File name has no dot.}
!      ("[^\\./]*\\'" . fundamental-mode)   
       ;; @r{File name ends in @samp{.C}.}
       ("\\.C\\'" . c++-mode))
     auto-mode-alist))
--- 675,685 ----
  @smallexample
  @group
  (setq auto-mode-alist
!   (append
     ;; @r{File name (within directory) starts with a dot.}
!    '(("/\\.[^/]*\\'" . fundamental-mode)
       ;; @r{File name has no dot.}
!      ("[^\\./]*\\'" . fundamental-mode)
       ;; @r{File name ends in @samp{.C}.}
       ("\\.C\\'" . c++-mode))
     auto-mode-alist))
***************
*** 742,748 ****
  The new command @var{variant} is defined to call the function
  @var{parent}, then override certain aspects of that parent mode:
  
! @itemize @bullet 
  @item
  The new mode has its own keymap, named @address@hidden
  @code{define-derived-mode} initializes this map to inherit from
--- 742,748 ----
  The new command @var{variant} is defined to call the function
  @var{parent}, then override certain aspects of that parent mode:
  
! @itemize @bullet
  @item
  The new mode has its own keymap, named @address@hidden
  @code{define-derived-mode} initializes this map to inherit from
***************
*** 751,775 ****
  @item
  The new mode has its own syntax table, kept in the variable
  @address@hidden
! @code{define-derived-mode} initializes this variable by copying 
  @address@hidden, if it is not already set.
  
  @item
  The new mode has its own abbrev table, kept in the variable
  @address@hidden
! @code{define-derived-mode} initializes this variable by copying 
  @address@hidden, if it is not already set.
  
  @item
  The new mode has its own mode hook, @address@hidden,
  which it runs in standard fashion as the very last thing that it does.
! (The new mode also runs the mode hook of @var{parent} as part 
  of calling @var{parent}.)
  @end itemize
  
  In addition, you can specify how to override other aspects of
  @var{parent} with @var{body}.  The command @var{variant}
! evaluates the forms in @var{body} after setting up all its usual 
  overrides, just before running @address@hidden
  
  The argument @var{docstring} specifies the documentation string for the
--- 751,775 ----
  @item
  The new mode has its own syntax table, kept in the variable
  @address@hidden
! @code{define-derived-mode} initializes this variable by copying
  @address@hidden, if it is not already set.
  
  @item
  The new mode has its own abbrev table, kept in the variable
  @address@hidden
! @code{define-derived-mode} initializes this variable by copying
  @address@hidden, if it is not already set.
  
  @item
  The new mode has its own mode hook, @address@hidden,
  which it runs in standard fashion as the very last thing that it does.
! (The new mode also runs the mode hook of @var{parent} as part
  of calling @var{parent}.)
  @end itemize
  
  In addition, you can specify how to override other aspects of
  @var{parent} with @var{body}.  The command @var{variant}
! evaluates the forms in @var{body} after setting up all its usual
  overrides, just before running @address@hidden
  
  The argument @var{docstring} specifies the documentation string for the
***************
*** 1011,1017 ****
  @smallexample
  (define-minor-mode hungry-mode
    "Toggle Hungry mode.
! With no argument, this command toggles the mode. 
  Non-null prefix argument turns on the mode.
  Null prefix argument turns off the mode.
  
--- 1011,1017 ----
  @smallexample
  (define-minor-mode hungry-mode
    "Toggle Hungry mode.
! With no argument, this command toggles the mode.
  Non-null prefix argument turns on the mode.
  Null prefix argument turns off the mode.
  
***************
*** 1025,1031 ****
   ;; The minor mode bindings.
   '(("\C-\^?" . hungry-electric-delete)
     ("\C-\M-\^?"
!     . (lambda () 
          (interactive)
          (hungry-electric-delete t)))))
  @end smallexample
--- 1025,1031 ----
   ;; The minor mode bindings.
   '(("\C-\^?" . hungry-electric-delete)
     ("\C-\M-\^?"
!     . (lambda ()
          (interactive)
          (hungry-electric-delete t)))))
  @end smallexample
***************
*** 1213,1234 ****
     'mode-line-mule-info
     'mode-line-modified
     'mode-line-frame-identification
!    "%b--" 
  @end group
  @group
     ;; @r{Note that this is evaluated while making the list.}
     ;; @r{It makes a mode line construct which is just a string.}
     (getenv "HOST")
  @end group
!    ":" 
     'default-directory
     "   "
     'global-mode-string
     "   %[("
     '(:eval (mode-line-mode-name))
!    'mode-line-process  
!    'minor-mode-alist 
!    "%n" 
     ")%]--"
  @group
     '(which-func-mode ("" which-func-format "--"))
--- 1213,1234 ----
     'mode-line-mule-info
     'mode-line-modified
     'mode-line-frame-identification
!    "%b--"
  @end group
  @group
     ;; @r{Note that this is evaluated while making the list.}
     ;; @r{It makes a mode line construct which is just a string.}
     (getenv "HOST")
  @end group
!    ":"
     'default-directory
     "   "
     'global-mode-string
     "   %[("
     '(:eval (mode-line-mode-name))
!    'mode-line-process
!    'minor-mode-alist
!    "%n"
     ")%]--"
  @group
     '(which-func-mode ("" which-func-format "--"))
***************
*** 1325,1333 ****
  @group
  minor-mode-alist
  @result{} ((vc-mode vc-mode)
!     (abbrev-mode " Abbrev") 
!     (overwrite-mode overwrite-mode) 
!     (auto-fill-function " Fill")         
      (defining-kbd-macro " Def")
      (isearch-mode isearch-mode))
  @end group
--- 1325,1333 ----
  @group
  minor-mode-alist
  @result{} ((vc-mode vc-mode)
!     (abbrev-mode " Abbrev")
!     (overwrite-mode overwrite-mode)
!     (auto-fill-function " Fill")
      (defining-kbd-macro " Def")
      (isearch-mode isearch-mode))
  @end group
***************
*** 1386,1393 ****
   ;; @r{properties to make it mouse-sensitive.}
   (:eval (mode-line-mode-name))
   mode-line-process
!  minor-mode-alist 
!  "%n" 
   ")%]--"
  @end group
  @group
--- 1386,1393 ----
   ;; @r{properties to make it mouse-sensitive.}
   (:eval (mode-line-mode-name))
   mode-line-process
!  minor-mode-alist
!  "%n"
   ")%]--"
  @end group
  @group
***************
*** 2146,2152 ****
  @item font-lock-function-name-face
  @vindex font-lock-function-name-face
  Used (typically) for the name of a function being defined or declared,
! in a function definition or declaration. 
  
  @item font-lock-variable-name-face
  @vindex font-lock-variable-name-face
--- 2146,2152 ----
  @item font-lock-function-name-face
  @vindex font-lock-function-name-face
  Used (typically) for the name of a function being defined or declared,
! in a function definition or declaration.
  
  @item font-lock-variable-name-face
  @vindex font-lock-variable-name-face