Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 864)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-41

admin/ChangeLog

@@ -1,3 +1,7 @@
+2007-08-28  Glenn Morris  <rgm@gnu.org>
+
+	* admin.el: Provide self.
+
 2007-08-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* FOR-RELEASE (http): Add Gtk+ tool bar and GUD focus problem.

admin/admin.el

@@ -205,5 +205,7 @@ Root must be the root of an Emacs source tree."
                               ?\" (0+ space)
                               "/* Long version number */")))))
 
+(provide 'admin)
+
 ;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
 ;; admin.el ends here.

lisp/ChangeLog

@@ -1,3 +1,17 @@
+2007-08-28  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>  (tiny change)
+
+	* play/gamegrid.el (gamegrid-init): Set line-spacing to 0.
+
+2007-08-28  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/cc-langs.el (c-constant-kwds): Add java: null, true,
+	false.
+
+2007-08-27  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+	* progmodes/modula2.el (m2-definition, m2-module):
+	Don't use previous-line.  Reported by T. V. Raman.
+
 2007-08-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* term/mac-win.el (mac-handle-toolbar-switch-mode): Add explicit

lisp/play/gamegrid.el

@@ -386,6 +386,7 @@ static unsigned char gamegrid_bits[] = {
 (defun gamegrid-init (options)
   (setq buffer-read-only t
 	truncate-lines t
+	line-spacing 0
 	gamegrid-display-options options)
   (buffer-disable-undo (current-buffer))
   (gamegrid-initialize-display))

lisp/progmodes/cc-langs.el

@@ -2075,6 +2075,7 @@ nevertheless contains a list separated with ';' and not ','."
 	    "false" "true")		; Defined in C99.
   objc    '("nil" "Nil")
   idl     '("TRUE" "FALSE")
+  java    '("true" "false" "null") ; technically "literals", not keywords
   pike    '("UNDEFINED")) ;; Not a keyword, but practically works as one.
 
 (c-lang-defconst c-primary-expr-kwds

lisp/progmodes/modula2.el

@@ -295,7 +295,7 @@ followed by the first character of the construct.
   (insert "DEFINITION MODULE ")
   (let ((name (read-string "Name: ")))
     (insert name ";\n\n\n\nEND " name ".\n"))
-  (previous-line 3))
+  (forward-line -3))
 
 (defun m2-else ()
   "Insert ELSE keyword and indent for next line."
@@ -364,7 +364,7 @@ followed by the first character of the construct.
   (insert "IMPLEMENTATION MODULE ")
   (let ((name (read-string "Name: ")))
     (insert name ";\n\n\n\nEND " name ".\n")
-    (previous-line 3)
+    (forward-line -3)
     (m2-header)
     (m2-type)
     (newline)