X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/68e7476278a3dc4bd13dab63cc23bc0e671e5525..d9a3d80e56e26f65ca3b35b242436a2b16dbf535:/lisp/cus-face.el

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index c9cba5858a..4be3b7552b 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -33,7 +31,6 @@
 
 ;;; Declaring a face.
 
-;;;###autoload
 (defun custom-declare-face (face spec doc &rest args)
   "Like `defface', but FACE is evaluated as a normal argument."
   (unless (get face 'face-defface-spec)
@@ -63,7 +60,6 @@
 
 ;;; Face attributes.
 
-;;;###autoload
 (defconst custom-face-attributes
   '((:family
      (string :tag "Font Family"
@@ -122,7 +118,8 @@
 	     :value normal		; default
 	     (const :tag "italic" italic)
 	     (const :tag "oblique" oblique)
-	     (const :tag "normal" normal)))
+	     (const :tag "normal" normal)
+	     (const :tag "roman" roman)))
 
     (:underline
      (choice :tag "Underline"
@@ -269,7 +266,6 @@ If FRAME is nil, use the global defaults for FACE."
 
 ;;; Initializing.
 
-;;;###autoload
 (defun custom-set-faces (&rest args)
   "Initialize faces according to user preferences.
 This associates the settings with the `user' theme.
@@ -357,7 +353,6 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
 ;; XEmacs compability function.  In XEmacs, when you reset a Custom
 ;; Theme, you have to specify the theme to reset it to.  We just apply
 ;; the next theme.
-;;;###autoload
 (defun custom-theme-reset-faces (theme &rest args)
   "Reset the specs in THEME of some faces to their specs in other themes.
 Each of the arguments ARGS has this form:
@@ -369,7 +364,6 @@ This means reset FACE.  The argument IGNORED is ignored."
   (dolist (arg args)
     (custom-push-theme 'theme-face (car arg) theme 'reset)))
 
-;;;###autoload
 (defun custom-reset-faces (&rest args)
   "Reset the specs of some faces to their specs in specified themes.
 This creates settings in the `user' theme.
@@ -385,5 +379,5 @@ This means reset FACE to its value in FROM-THEME."
 
 (provide 'cus-face)
 
-;;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b
+;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b
 ;;; cus-face.el ends here