[Emacs-diffs] Changes to emacs/lisp/textmodes/texinfo.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/texinfo.el
diff -c emacs/lisp/textmodes/texinfo.el:1.92 
emacs/lisp/textmodes/texinfo.el:1.93
*** emacs/lisp/textmodes/texinfo.el:1.92        Tue Oct 29 02:52:32 2002
--- emacs/lisp/textmodes/texinfo.el     Tue Feb  4 08:30:45 2003
***************
*** 317,323 ****
    "Syntactic keywords to catch comment delimiters in `texinfo-mode'.")
  
  (defconst texinfo-environments
!   '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac" 
      "defmethod" "defop" "defopt" "defspec" "deftp" "deftypefn"
      "deftypefun" "deftypevar" "deftypevr" "defun" "defvar"
      "defvr" "description" "detailmenu" "direntry" "display"
--- 317,323 ----
    "Syntactic keywords to catch comment delimiters in `texinfo-mode'.")
  
  (defconst texinfo-environments
!   '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac"
      "defmethod" "defop" "defopt" "defspec" "deftp" "deftypefn"
      "deftypefun" "deftypevar" "deftypevr" "defun" "defvar"
      "defvr" "description" "detailmenu" "direntry" "display"
***************
*** 634,640 ****
         (if (null auto-fill-inhibit-regexp)
             prevent-filling
           (concat auto-fill-inhibit-regexp "\\|" prevent-filling)))))
!                 
  
  
  ;;; Insert string commands
--- 634,640 ----
         (if (null auto-fill-inhibit-regexp)
             prevent-filling
           (concat auto-fill-inhibit-regexp "\\|" prevent-filling)))))
! 
  
  
  ;;; Insert string commands
***************
*** 696,702 ****
         (if (memq (char-syntax (preceding-char)) '(?\( ?> ?\ ))
           texinfo-open-quote
         texinfo-close-quote)))))
!       
  ;; The following address@hidden command not only inserts a SPC
  ;; after the @end, but tries to find out what belongs there.  It is
  ;; not very smart: it does not understand nested lists.
--- 696,702 ----
         (if (memq (char-syntax (preceding-char)) '(?\( ?> ?\ ))
           texinfo-open-quote
         texinfo-close-quote)))))
! 
  ;; The following address@hidden command not only inserts a SPC
  ;; after the @end, but tries to find out what belongs there.  It is
  ;; not very smart: it does not understand nested lists.
***************
*** 877,883 ****
  
  Lines with structuring commands beginning in them are displayed in
  another buffer named `*Occur*'.  In that buffer, you can move point to
! one of those lines and then use 
  \\<occur-mode-map>\\[occur-mode-goto-occurrence],
  to jump to the corresponding spot in the Texinfo source file."
  
--- 877,883 ----
  
  Lines with structuring commands beginning in them are displayed in
  another buffer named `*Occur*'.  In that buffer, you can move point to
! one of those lines and then use
  \\<occur-mode-map>\\[occur-mode-goto-occurrence],
  to jump to the corresponding spot in the Texinfo source file."
  
***************
*** 887,893 ****
          current-location)
      (save-excursion
        (end-of-line)            ; so as to find section on current line
!       (if (re-search-backward 
             ;; do not require `texinfo-section-types-regexp' in texnfo-upd.el
             "address@hidden(chapter 
\\|sect\\|subs\\|subh\\|unnum\\|major\\|chapheading \\|heading \\|appendix\\)"
             nil t)
--- 887,893 ----
          current-location)
      (save-excursion
        (end-of-line)            ; so as to find section on current line
!       (if (re-search-backward
             ;; do not require `texinfo-section-types-regexp' in texnfo-upd.el
             "address@hidden(chapter 
\\|sect\\|subs\\|subh\\|unnum\\|major\\|chapheading \\|heading \\|appendix\\)"
             nil t)
***************
*** 918,924 ****
            (indent-to-column (+ (current-column) (* 4 (- level 2))))
            (beginning-of-line))))
      ;; Third, go to line corresponding to location in source file
!     ;; potential bug: two exactly similar `current-location' lines ... 
      (goto-char (point-min))
      (re-search-forward current-location nil t)
      (beginning-of-line)
--- 918,924 ----
            (indent-to-column (+ (current-column) (* 4 (- level 2))))
            (beginning-of-line))))
      ;; Third, go to line corresponding to location in source file
!     ;; potential bug: two exactly similar `current-location' lines ...
      (goto-char (point-min))
      (re-search-forward current-location nil t)
      (beginning-of-line)