* vc/vc.el (vc-merge): Fix a prompt.

[gnu-emacs] / lisp / paths.el

diff --git a/lisp/paths.el b/lisp/paths.el
index c608fd98993b447fec9f155aa0d2776ad55c29e0..70b5ca5dbfb03a80f45754f73ff33726d1d93c6e 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,6 +1,6 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1986, 1988, 1994, 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1988, 1994, 1999-2012  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -132,12 +132,8 @@ should be set to `(system-name)'.")
 *The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 
-;; This is a defcustom, which make-docfile does not recognize in
-;; uncompiled Lisp code.  If we use the "\ method of writing the doc,
-;; it does not get a doc string.  Somehow if we write it in the "wrong"
-;; (ie normal) way (as below), it does...  See also remote-shell-program.
-(defcustom rmail-file-name (purecopy "~/RMAIL")
-  "Name of user's primary mail file."
+(defcustom rmail-file-name (purecopy "~/RMAIL") "\
+Name of user's primary mail file."
   :type 'string
   :group 'rmail
   :version "21.1")