12 files changed, 96 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb2291dc3e9..d13d048c98e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,43 @@
+2008-03-06  Kim F. Storm  <storm@cua.dk>
+
+	* help.el (view-emacs-todo, describe-gnu-project): Define obsolete
+	function aliases for the old names.
+
+2008-03-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* iswitchb.el (iswitchb-use-faces): Doc fix.
+	(iswitchb-buffer-ignore, iswitchb-read-buffer): Fix typos in
+	docstrings.
+
+2008-03-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* progmodes/verilog-mode.el (verilog-highlight-grouping-keywords):
+	Fix typo.
+	(verilog-type-font-keywords): Reindent.
+
+2008-03-03  Michael McNamara  <mac@mail.brushroad.com>
+
+	* verilog-mode.el (verilog-font-grouping-keywords): Fix bug in the
+	grouping-keyword regular expression.
+	(verilog-font-lock-keywords): Allow users to toggle special
+	highlight of grouping-keywords.
+	(verilog-highlight-grouping-keywords): The toggle for special
+	highlighting of grouping keywords.
+
+2008-03-02  Juri Linkov  <juri@jurta.org>
+
+	* startup.el: Revert 2008-02-28 change that adds initial message
+	to *scratch* buffer regardless of the value of
+	`inhibit-startup-screen'.
+
+2008-03-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* textmodes/css-mode.el (css-indent-offset, css-electric-keys):
+	* textmodes/bibtex-style.el (bibtex-style-indent-basic):
+	* progmodes/verilog-mode.el (verilog-mode):
+	* net/socks.el (socks):
+	* vc-mtn.el (vc-mtn-mode-line-rewrite): Add :version.
+
 2008-03-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* doc-view.el (bookmark-buffer-file-name, bookmark-prop-get): Declare.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d71fcb0e73c..7cc373e435b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,9 +1,14 @@
 2008-03-07  Karl Fogel  <kfogel@red-bean.com>
 
-	* lisp/gnus/gnus-bookmark.el: Adjust for renames in bookmark.el.
+	* gnus-bookmark.el: Adjust for renames in bookmark.el.
 	(gnus-bookmark-make-record): Was `gnus-bookmark-make-cell'.
 	(gnus-bookmark-jump): Adjust some variable names.
 
+2008-03-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-sum.el (gnus-print-buffer): Honor ps-print-color-p.
+	Suggested by <chris.anderton@zetnet.co.uk>.
+
 2008-03-05  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-art.el (gnus-article-mode-line-format-alist): Move to gnus-sum.
@@ -144,9 +149,9 @@
 2008-02-11  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-topic.el (gnus-topic-select-group, gnus-topic-read-group):
-	Document negativ prefix.
+	Document negative prefix.
 
-	* gnus-group.el (gnus-group-read-group): Document negativ prefix.
+	* gnus-group.el (gnus-group-read-group): Document negative prefix.
 
 2008-02-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index ce22d171686..48232ae53f7 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9277,7 +9277,7 @@ to save in."
 			  (mail-header-date gnus-current-headers) ")"))))
 	    (gnus-run-hooks 'gnus-ps-print-hook)
 	    (save-excursion
-	      (if window-system
+	      (if ps-print-color-p
 		  (ps-spool-buffer-with-faces)
 		(ps-spool-buffer)))))
       (kill-buffer buffer))))
diff --git a/lisp/help.el b/lisp/help.el
index 30734752abf..a698e87950b 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -315,6 +315,8 @@ If that doesn't give a function, return nil."
   (interactive)
   (view-help-file "THE-GNU-PROJECT"))
 
+(define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
+
 (defun describe-no-warranty ()
   "Display info on all the kinds of warranty Emacs does NOT have."
   (interactive)
@@ -418,6 +420,9 @@ With argument, display info only for the selected version."
   (interactive "P")
   (view-help-file "TODO"))
 
+(define-obsolete-function-alias 'view-todo 'view-emacs-todo "22.2")
+
+
 (defun view-echo-area-messages ()
   "View the log of recent echo-area messages: the `*Messages*' buffer.
 The number of messages retained in that buffer
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index e14d8ed53f9..4e89659dc8d 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -270,7 +270,7 @@ is temporarily case sensitive."
   "*List of regexps or functions matching buffer names to ignore.
 For example, traditional behavior is not to list buffers whose names begin
 with a space, for which the regexp is `^ '.  See the source file for
-example functions that filter buffernames."
+example functions that filter buffer names."
   :type '(repeat (choice regexp function))
   :group 'iswitchb)
 (put 'iswitchb-buffer-ignore 'risky-local-variable t)
@@ -354,7 +354,7 @@ See also `iswitchb-newbuffer'."
   :group 'iswitchb)
 
 (defcustom iswitchb-use-faces t
-  "*Non-nil means use font-lock fonts for showing first match."
+  "*Non-nil means use font-lock faces for showing first match."
   :type 'boolean
   :group 'iswitchb)
 (define-obsolete-variable-alias 'iswitchb-use-fonts 'iswitchb-use-faces "22.1")
@@ -606,7 +606,7 @@ Return the name of a buffer selected.
 PROMPT is the prompt to give to the user.
 DEFAULT if given is the default buffer to be selected, which will
 go to the front of the list.
-If REQUIRE-MATCH is non-nil, an existing-buffer must be selected.
+If REQUIRE-MATCH is non-nil, an existing buffer must be selected.
 If START is a string, the selection process is started with that
 string.
 If MATCHES-SET is non-nil, the buflist is not updated before
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index c02db08d060..40020df9a1c 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -100,6 +100,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defgroup socks nil
   "SOCKS Support"
+  :version "22.2"
   :prefix "socks-"
   :group 'processes)
 
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index ac7592287c0..565b5e39137 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -677,7 +677,7 @@ With any other arg, set comment column to indentation of the previous comment
 
 ;;;###autoload
 (defun comment-kill (arg)
-  "Kill the comment on this line, if any.
+  "Kill the first comment on this line, if any.
 With prefix ARG, kill comments on that many lines starting with this one."
   (interactive "P")
   (comment-normalize-vars)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index fd9b3d30d59..b24ccdc5bad 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -115,9 +115,9 @@
 ;;; Code:
 
 ;; This variable will always hold the version number of the mode
-(defconst verilog-mode-version "399"
+(defconst verilog-mode-version "404"
   "Version of this Verilog mode.")
-(defconst verilog-mode-release-date "2008-02-19-GNU"
+(defconst verilog-mode-release-date "2008-03-02-GNU"
   "Release date of this Verilog mode.")
 (defconst verilog-mode-release-emacs t
   "If non-nil, this version of Verilog mode was released with Emacs itself.")
@@ -276,6 +276,7 @@ STRING should be given if the last search was by `string-match' on STRING."
 
 (defgroup verilog-mode nil
   "Facilitates easy editing of Verilog source text."
+  :version "22.2"
   :group 'languages)
 
 ; (defgroup verilog-mode-fonts nil
@@ -530,6 +531,15 @@ to see the effect as font color choices are cached by Emacs."
   :type 'boolean)
 (put 'verilog-highlight-p1800-keywords 'safe-local-variable 'verilog-booleanp)
 
+(defcustom verilog-highlight-grouping-keywords nil
+  "*True means highlight grouping keywords 'begin' and 'end' more dramatically.
+If false, these words are in the font-lock-type-face; if True then they are in
+`verilog-font-lock-ams-face'. Some find that special highlighting on these
+grouping constructs allow the structure of the code to be understood at a glance."
+  :group 'verilog-mode-indent
+  :type 'boolean)
+(put 'verilog-highlight-grouping-keywords 'safe-local-variable 'verilog-booleanp)
+
 (defcustom verilog-auto-endcomments t
   "*True means insert a comment /* ... */ after 'end's.
 The name of the function or case will be set between the braces."
@@ -1898,13 +1908,16 @@ See also `verilog-font-lock-extra-types'.")
 	 ;; Fontify all builtin keywords
 	 (concat "\\<\\(" verilog-font-keywords "\\|"
 		       ;; And user/system tasks and functions
-		       "\\$[a-zA-Z][a-zA-Z0-9_\\$]*"
-		       "\\)\\>")
+              "\\$[a-zA-Z][a-zA-Z0-9_\\$]*"
+              "\\)\\>")
 	 ;; Fontify all types
-	 (cons (concat "\\(\\<" verilog-font-grouping-keywords "\\)\\>") 
-	       'verilog-font-lock-ams-face)
-	 (cons (concat "\\<\\(" verilog-type-font-keywords "\\)\\>") 
-	       'font-lock-type-face)
+	 (if verilog-highlight-grouping-keywords
+	     (cons (concat "\\<\\(" verilog-font-grouping-keywords "\\)\\>")
+		   'verilog-font-lock-ams-face)
+	   (cons (concat "\\<\\(" verilog-font-grouping-keywords "\\)\\>")
+		 'font-lock-type-face))
+	 (cons (concat "\\<\\(" verilog-type-font-keywords "\\)\\>")
+          'font-lock-type-face)
 	 ;; Fontify IEEE-P1800 keywords appropriately
 	 (if verilog-highlight-p1800-keywords
 	     (cons (concat "\\<\\(" verilog-p1800-keywords "\\)\\>")
diff --git a/lisp/startup.el b/lisp/startup.el
index 8ab56eee180..1f0cff2ccec 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -56,6 +56,7 @@ directory using `find-file'.  If t, open the `*scratch*' buffer."
 
 (defcustom inhibit-startup-screen nil
   "Non-nil inhibits the startup screen.
+It also inhibits display of the initial message in the `*scratch*' buffer.
 
 This is for use in your personal init file (but NOT site-start.el), once
 you are familiar with the contents of the startup screen."
@@ -1154,7 +1155,9 @@ opening the first frame (e.g. open a connection to an X server).")
 
 ")
   "Initial message displayed in *scratch* buffer at startup.
-If this is nil, no message will be displayed."
+If this is nil, no message will be displayed.
+If `inhibit-startup-screen' is non-nil, then no message is displayed,
+regardless of the value of this variable."
   :type '(choice (text :tag "Message")
 		 (const :tag "none" nil))
   :group 'initialization)
@@ -2239,6 +2242,14 @@ A fancy display is used on graphic displays, normal otherwise."
       ;; (with-no-warnings
       ;; 	(setq menubar-bindings-done t))
 
+      ;; If *scratch* exists and is empty, insert initial-scratch-message.
+      (and initial-scratch-message
+	   (get-buffer "*scratch*")
+	   (with-current-buffer "*scratch*"
+	     (when (zerop (buffer-size))
+	       (insert initial-scratch-message)
+	       (set-buffer-modified-p nil))))
+
       (if (> file-count 0)
 	  (display-startup-screen t)
 	(display-startup-screen nil)))))
diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 24400ceeaf5..0c5317c7d4e 100644
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -95,6 +95,7 @@
 
 (defcustom bibtex-style-indent-basic 2
   "Basic amount of indentation to use in BibTeX Style mode."
+  :version "22.2"
   :type 'integer
   :group 'bibtex)
 
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 2359f8ff1a1..60ba63f3a59 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -177,6 +177,7 @@
 
 (defcustom css-electric-keys '(?\} ?\;) ;; '()
   "Self inserting keys which should trigger re-indentation."
+  :version "22.2"
   :type '(repeat character)
   :options '((?\} ?\;))
   :group 'css)
@@ -399,6 +400,7 @@
 
 (defcustom css-indent-offset 4
   "Basic size of one indentation step."
+  :version "22.2"
   :type 'integer
   :group 'css)
 
diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el
index e2002f4e782..6a7f72db44b 100644
--- a/lisp/vc-mtn.el
+++ b/lisp/vc-mtn.el
@@ -110,6 +110,7 @@
   '(("\\`[^:/#]*[:/#]" . ""))           ;Drop the host part.
   "Rewrite rules to shorten Mtn's revision names on the mode-line."
   :type '(repeat (cons regexp string))
+  :version "22.2"
   :group 'vc)
 
 (defun vc-mtn-mode-line-string (file)