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

[Juanma Barranquero]

Index: emacs/lisp/textmodes/bibtex.el
diff -c emacs/lisp/textmodes/bibtex.el:1.73 emacs/lisp/textmodes/bibtex.el:1.74
*** emacs/lisp/textmodes/bibtex.el:1.73 Fri Oct 18 04:27:27 2002
--- emacs/lisp/textmodes/bibtex.el      Tue Feb  4 08:30:44 2003
***************
*** 1019,1025 ****
                        "\\("
                            "[^\"\\]"               ;; anything but quote or 
backslash
                            "\\|"
!                           "\\(" 
                                "\\\\\\(.\\|\n\\)"  ;; any backslash quoted 
character
                            "\\)"
                        "\\)*"
--- 1019,1025 ----
                        "\\("
                            "[^\"\\]"               ;; anything but quote or 
backslash
                            "\\|"
!                           "\\("
                                "\\\\\\(.\\|\n\\)"  ;; any backslash quoted 
character
                            "\\)"
                        "\\)*"
***************
*** 1038,1044 ****
        (if (looking-at "\"")
          (setq end-point (bibtex-parse-quoted-string)))
        (goto-char starting-point)
!       (if end-point 
          (cons starting-point end-point)
        nil))))
  
--- 1038,1044 ----
        (if (looking-at "\"")
          (setq end-point (bibtex-parse-quoted-string)))
        (goto-char starting-point)
!       (if end-point
          (cons starting-point end-point)
        nil))))
  
***************
*** 1153,1163 ****
      (setq bibtex-field-name-for-parsing name)
      (let ((starting-point (point))
          (boundaries nil))
!       (while (and (not boundaries) 
                  (< (point) bound)
                  (search-forward "," bound t))
        (goto-char (match-beginning 0))
!       (let ((temp-boundaries 
               (bibtex-parse-association 'bibtex-parse-field-name
                                         'bibtex-parse-field-text)))
          (if (and temp-boundaries (<= (cdr (cdr temp-boundaries)) bound))
--- 1153,1163 ----
      (setq bibtex-field-name-for-parsing name)
      (let ((starting-point (point))
          (boundaries nil))
!       (while (and (not boundaries)
                  (< (point) bound)
                  (search-forward "," bound t))
        (goto-char (match-beginning 0))
!       (let ((temp-boundaries
               (bibtex-parse-association 'bibtex-parse-field-name
                                         'bibtex-parse-field-text)))
          (if (and temp-boundaries (<= (cdr (cdr temp-boundaries)) bound))
***************
*** 1178,1184 ****
        (while (and (not boundaries)
                  (>= (point) bound)
                  (search-backward "," bound t))
!       (let ((temp-boundaries 
               (bibtex-parse-association 'bibtex-parse-field-name
                                         'bibtex-parse-field-text)))
          (if temp-boundaries
--- 1178,1184 ----
        (while (and (not boundaries)
                  (>= (point) bound)
                  (search-backward "," bound t))
!       (let ((temp-boundaries
               (bibtex-parse-association 'bibtex-parse-field-name
                                         'bibtex-parse-field-text)))
          (if temp-boundaries
***************
*** 1224,1230 ****
        (progn
          (goto-char (cdr text-boundaries))
          (if (looking-at "[ \t\n]*[})]")
!             (let ((boundaries (list (car text-boundaries) 
                                      (cdr text-boundaries)
                                      (match-end 0))))
                (goto-char (match-end 0))
--- 1224,1230 ----
        (progn
          (goto-char (cdr text-boundaries))
          (if (looking-at "[ \t\n]*[})]")
!             (let ((boundaries (list (car text-boundaries)
                                      (cdr text-boundaries)
                                      (match-end 0))))
                (goto-char (match-end 0))
***************
*** 1245,1252 ****
      (let* ((case-fold-search t)
           (starting-point (point))
           (boundaries nil))
!       (while (and (not boundaries) 
!                 (search-forward-regexp 
                   "^[ address@hidden \t\n]*[({][ \t\n]*" nil t))
        (goto-char (match-beginning 0))
        (let ((temp-boundaries (bibtex-parse-string)))
--- 1245,1252 ----
      (let* ((case-fold-search t)
           (starting-point (point))
           (boundaries nil))
!       (while (and (not boundaries)
!                 (search-forward-regexp
                   "^[ address@hidden \t\n]*[({][ \t\n]*" nil t))
        (goto-char (match-beginning 0))
        (let ((temp-boundaries (bibtex-parse-string)))
***************
*** 1265,1271 ****
           (starting-point (point))
           (boundaries nil))
        (while (and (not boundaries)
!                 (search-backward-regexp 
                   "^[ address@hidden \t\n]*[({][ \t\n]*" nil t))
        (goto-char (match-beginning 0))
        (let ((temp-boundaries (bibtex-parse-string)))
--- 1265,1271 ----
           (starting-point (point))
           (boundaries nil))
        (while (and (not boundaries)
!                 (search-backward-regexp
                   "^[ address@hidden \t\n]*[({][ \t\n]*" nil t))
        (goto-char (match-beginning 0))
        (let ((temp-boundaries (bibtex-parse-string)))
***************
*** 2090,2096 ****
    (let* ((case-fold-search t)
         (year (bibtex-autokey-get-yearfield-digits max)))
      (if (and (string= year "") bibtex-autokey-year-use-crossref-entry)
!       (let* ((bounds 
                (bibtex-search-forward-field "\\(OPT\\)?crossref" max))
               (crossref-field
                (if bounds
--- 2090,2096 ----
    (let* ((case-fold-search t)
         (year (bibtex-autokey-get-yearfield-digits max)))
      (if (and (string= year "") bibtex-autokey-year-use-crossref-entry)
!       (let* ((bounds
                (bibtex-search-forward-field "\\(OPT\\)?crossref" max))
               (crossref-field
                (if bounds
***************
*** 2518,2529 ****
          (while (and (not failure) (> arg 0))
            (cond ((eq direction 'previous)
                   (setq bounds (bibtex-search-backward-field field-name 
(point-min)))
!                  (if bounds 
                       (goto-char (bibtex-start-of-field bounds))
                     (setq failure t)))
                  ((eq direction 'next)
                   (setq bounds (bibtex-search-forward-field field-name 
(point-max)))
!                  (if bounds 
                       (goto-char (bibtex-end-of-field bounds))
                     (setq failure t))))
            (setq arg (- arg 1)))
--- 2518,2529 ----
          (while (and (not failure) (> arg 0))
            (cond ((eq direction 'previous)
                   (setq bounds (bibtex-search-backward-field field-name 
(point-min)))
!                  (if bounds
                       (goto-char (bibtex-start-of-field bounds))
                     (setq failure t)))
                  ((eq direction 'next)
                   (setq bounds (bibtex-search-forward-field field-name 
(point-max)))
!                  (if bounds
                       (goto-char (bibtex-end-of-field bounds))
                     (setq failure t))))
            (setq arg (- arg 1)))