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

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/lisp-mode.el
diff -c emacs/lisp/emacs-lisp/lisp-mode.el:1.186 
emacs/lisp/emacs-lisp/lisp-mode.el:1.187
*** emacs/lisp/emacs-lisp/lisp-mode.el:1.186    Wed Oct  5 15:03:09 2005
--- emacs/lisp/emacs-lisp/lisp-mode.el  Wed Oct  5 15:19:38 2005
***************
*** 59,67 ****
        (modify-syntax-entry ?\t "    " table)
        (modify-syntax-entry ?\f "    " table)
        (modify-syntax-entry ?\n ">   " table)
! ;;; This is probably obsolete since nowadays such features use overlays.
! ;;;      ;; Give CR the same syntax as newline, for selective-display.
! ;;;      (modify-syntax-entry ?\^m ">   " table)
        (modify-syntax-entry ?\; "<   " table)
        (modify-syntax-entry ?` "'   " table)
        (modify-syntax-entry ?' "'   " table)
--- 59,67 ----
        (modify-syntax-entry ?\t "    " table)
        (modify-syntax-entry ?\f "    " table)
        (modify-syntax-entry ?\n ">   " table)
!       ;; This is probably obsolete since nowadays such features use overlays.
!       ;; ;; Give CR the same syntax as newline, for selective-display.
!       ;; (modify-syntax-entry ?\^m ">   " table)
        (modify-syntax-entry ?\; "<   " table)
        (modify-syntax-entry ?` "'   " table)
        (modify-syntax-entry ?' "'   " table)
***************
*** 82,89 ****
    (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
      (modify-syntax-entry ?\[ "_   " table)
      (modify-syntax-entry ?\] "_   " table)
!     (modify-syntax-entry ?# "' 14bn" table)
!     (modify-syntax-entry ?| "\" 23b" table)
      table))
  
  (define-abbrev-table 'lisp-mode-abbrev-table ())
--- 82,89 ----
    (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
      (modify-syntax-entry ?\[ "_   " table)
      (modify-syntax-entry ?\] "_   " table)
!     (modify-syntax-entry ?# "' 14b" table)
!     (modify-syntax-entry ?| "\" 23bn" table)
      table))
  
  (define-abbrev-table 'lisp-mode-abbrev-table ())
***************
*** 154,188 ****
  
  (defun lisp-font-lock-syntactic-face-function (state)
    (if (nth 3 state)
!       ;; This might be a docstring.
!       (let* ((listbeg (nth 1 state))
!              (firstsym (and listbeg
!                             (save-excursion
!                               (goto-char listbeg)
!                               (and (looking-at "([ 
\t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
!                                    (match-string 1)))))
!              (docelt (and firstsym (get (intern-soft firstsym)
!                                         lisp-doc-string-elt-property))))
!         (if (and docelt
!                  ;; It's a string passed to a macro that has docstrings.
!                  ;; Check whether it's in docstring position.
!                  (let ((startpos (nth 8 state)))
!                    (save-excursion
!                      (when (functionp docelt)
!                        (goto-char (match-end 1))
!                        (setq docelt (funcall docelt)))
!                      (goto-char listbeg)
!                      (forward-char 1)
!                      (condition-case nil
!                          (while (and (> docelt 0) (< (point) startpos)
!                                      (progn (forward-sexp 1) t))
!                            (setq docelt (1- docelt)))
!                        (error nil))
!                      (and (zerop docelt) (<= (point) startpos)
!                           (progn (forward-comment (point-max)) t)
!                           (= (point) (nth 8 state))))))
!             font-lock-doc-face
!           font-lock-string-face))
      font-lock-comment-face))
  
  ;; The LISP-SYNTAX argument is used by code in inf-lisp.el and is
--- 154,191 ----
  
  (defun lisp-font-lock-syntactic-face-function (state)
    (if (nth 3 state)
!       ;; This might be a (doc)string or a |...| symbol.
!       (let ((startpos (nth 8 state)))
!         (if (eq (char-after startpos) ?|)
!             ;; This is not a string, but a |...| symbol.
!             nil
!           (let* ((listbeg (nth 1 state))
!                  (firstsym (and listbeg
!                                 (save-excursion
!                                   (goto-char listbeg)
!                                   (and (looking-at "([ 
\t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
!                                        (match-string 1)))))
!                  (docelt (and firstsym (get (intern-soft firstsym)
!                                             lisp-doc-string-elt-property))))
!             (if (and docelt
!                      ;; It's a string in a form that can have a docstring.
!                      ;; Check whether it's in docstring position.
!                      (save-excursion
!                        (when (functionp docelt)
!                          (goto-char (match-end 1))
!                          (setq docelt (funcall docelt)))
!                        (goto-char listbeg)
!                        (forward-char 1)
!                        (condition-case nil
!                            (while (and (> docelt 0) (< (point) startpos)
!                                        (progn (forward-sexp 1) t))
!                              (setq docelt (1- docelt)))
!                          (error nil))
!                        (and (zerop docelt) (<= (point) startpos)
!                             (progn (forward-comment (point-max)) t)
!                             (= (point) (nth 8 state)))))
!                 font-lock-doc-face
!               font-lock-string-face))))
      font-lock-comment-face))
  
  ;; The LISP-SYNTAX argument is used by code in inf-lisp.el and is