diff lisp/emacs-lisp/lisp-mode.el @ 90200:f9a65d7ebd29

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-68 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 459-473) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 86-87) - Update from CVS

--- a/lisp/emacs-lisp/lisp-mode.el	Thu Jun 30 00:31:46 2005 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Thu Jul 07 12:43:14 2005 +0000
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -172,6 +172,10 @@
   (setq paragraph-ignore-fill-prefix t)
   (make-local-variable 'fill-paragraph-function)
   (setq fill-paragraph-function 'lisp-fill-paragraph)
+  ;; Adaptive fill mode gets the fill wrong for a one-line paragraph made of
+  ;; a single docstring.  Let's fix it here.
+  (set (make-local-variable 'adaptive-fill-function)
+       (lambda () (if (looking-at "\\s-+\"[^\n\"]+\"\\s-*$") "")))
   ;; Adaptive fill mode gets in the way of auto-fill,
   ;; and should make no difference for explicit fill
   ;; because lisp-fill-paragraph should do the job.
@@ -631,10 +635,10 @@
 	 ;; Resetting `saved-face' temporarily to nil is needed to let
 	 ;; `defface' change the spec, regardless of a saved spec.
 	 (prog1 `(prog1 ,form
-		   (put ',(eval (nth 1 form)) 'saved-face
+		   (put ,(nth 1 form) 'saved-face
 			',(get (eval (nth 1 form)) 'saved-face))
-		   (put ',(eval (nth 1 form)) 'customized-face
-			',(eval (nth 2 form))))
+		   (put ,(nth 1 form) 'customized-face
+			,(nth 2 form)))
 	   (put (eval (nth 1 form)) 'saved-face nil)))
 	((eq (car form) 'progn)
 	 (cons 'progn (mapcar 'eval-defun-1 (cdr form))))