Now on revision 113092.
------------------------------------------------------------
revno: 113092
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Wed 2013-06-19 18:19:43 -0700
message:
  * floatfns.c: Add commentary re C99 and C11.
diff:
=== modified file 'src/floatfns.c'
--- src/floatfns.c	2013-06-17 06:03:19 +0000
+++ src/floatfns.c	2013-06-20 01:19:43 +0000
@@ -26,6 +26,17 @@
    the starred functions since we haven't found a use for them:
    acos, asin, atan, atan2, ceil, cos, *cosh, exp, fabs, floor, fmod,
    frexp, ldexp, log, log10, *modf, pow, sin, *sinh, sqrt, tan, *tanh.
+
+   C99 and C11 require the following math.h functions in addition to
+   the C89 functions.  Of these, Emacs currently exports only the
+   starred ones to Lisp, since we haven't found a use for the others:
+   acosh, atanh, cbrt, *copysign, erf, erfc, exp2, expm1, fdim, fma,
+   fmax, fmin, fpclassify, hypot, ilogb, isfinite, isgreater,
+   isgreaterequal, isinf, isless, islessequal, islessgreater, *isnan,
+   isnormal, isunordered, lgamma, log1p, log2, *logb (approximately),
+   lrint/llrint, lround/llround, nan, nearbyint, nextafter,
+   nexttoward, remainder, remquo, *rint, round, scalbln, scalbn,
+   signbit, tgamma, trunc.
  */
 
 #include <config.h>
------------------------------------------------------------
revno: 113091
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Thu 2013-06-20 03:03:57 +0200
message:
  lisp/ansi-color.el: Convert to lexical binding.
  (ansi-colors): Fix URL.
  (ansi-color-context, ansi-color-context-region): Use defvar-local.
  (ansi-color-apply-sequence, ansi-color-map): Fix typos in docstrings.
  (ansi-color-make-color-map): Rename local var ansi-color-map to map.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-20 00:39:59 +0000
+++ lisp/ChangeLog	2013-06-20 01:03:57 +0000
@@ -1,5 +1,11 @@
 2013-06-20  Juanma Barranquero  <lekktu@gmail.com>
 
+	* ansi-color.el: Convert to lexical binding.
+	(ansi-colors): Fix URL.
+	(ansi-color-context, ansi-color-context-region): Use defvar-local.
+	(ansi-color-apply-sequence, ansi-color-map): Fix typos in docstrings.
+	(ansi-color-make-color-map): Rename local var ansi-color-map to map.
+
 	* progmodes/prog-mode.el (prettify-symbols-mode)
 	(global-prettify-symbols-mode, prog-mode): Remove autoload cookies.
 

=== modified file 'lisp/ansi-color.el'
--- lisp/ansi-color.el	2013-01-01 09:11:05 +0000
+++ lisp/ansi-color.el	2013-06-20 01:03:57 +0000
@@ -1,4 +1,4 @@
-;;; ansi-color.el --- translate ANSI escape sequences into faces
+;;; ansi-color.el --- translate ANSI escape sequences into faces -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
@@ -84,8 +84,9 @@
 This translation effectively colorizes strings and regions based upon
 SGR control sequences embedded in the text.  SGR (Select Graphic
 Rendition) control sequences are defined in section 8.3.117 of the
-ECMA-48 standard \(identical to ISO/IEC 6429), which is freely available
-as a PDF file <URL:http://www.ecma.ch/ecma1/STAND/ECMA-048.HTM>."
+ECMA-48 standard (identical to ISO/IEC 6429), which is freely available
+at <URL:http://www.ecma-international.org/publications/standards/Ecma-048.htm>
+as a PDF file."
   :version "21.1"
   :group 'processes)
 
@@ -119,7 +120,7 @@
   ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"]
   "Colors used for SGR control sequences determining a color.
 This vector holds the colors used for SGR control sequences parameters
-30 to 37 \(foreground colors) and 40 to 47 (background colors).
+30 to 37 (foreground colors) and 40 to 47 (background colors).
 
 Parameter  Color
   30  40   black
@@ -234,14 +235,13 @@
   'font-lock-default-unfontify-region "24.1")
 
 ;; Working with strings
-(defvar ansi-color-context nil
+(defvar-local ansi-color-context nil
   "Context saved between two calls to `ansi-color-apply'.
 This is a list of the form (CODES FRAGMENT) or nil.  CODES
 represents the state the last call to `ansi-color-apply' ended
 with, currently a list of ansi codes, and FRAGMENT is a string
 starting with an escape sequence, possibly the start of a new
 escape sequence.")
-(make-variable-buffer-local 'ansi-color-context)
 
 (defun ansi-color-filter-apply (string)
   "Filter out all ANSI control sequences from STRING.
@@ -324,7 +324,8 @@
       (setq codes (ansi-color-apply-sequence escape-sequence codes)))
     ;; if the rest of the string should have a face, put it there
     (when codes
-      (put-text-property start (length string) 'font-lock-face (ansi-color--find-face codes) string))
+      (put-text-property start (length string)
+                         'font-lock-face (ansi-color--find-face codes) string))
     ;; save context, add the remainder of the string to the result
     (let (fragment)
       (if (string-match "\033" string start)
@@ -337,14 +338,13 @@
 
 ;; Working with regions
 
-(defvar ansi-color-context-region nil
+(defvar-local ansi-color-context-region nil
   "Context saved between two calls to `ansi-color-apply-on-region'.
 This is a list of the form (CODES MARKER) or nil.  CODES
 represents the state the last call to `ansi-color-apply-on-region'
 ended with, currently a list of ansi codes, and MARKER is a
 buffer position within an escape sequence or the last position
 processed.")
-(make-variable-buffer-local 'ansi-color-context-region)
 
 (defun ansi-color-filter-region (begin end)
   "Filter out all ANSI control sequences from region BEGIN to END.
@@ -461,7 +461,7 @@
   "Return a face with PROPERTY set to COLOR.
 PROPERTY can be either symbol `foreground' or symbol `background'.
 
-For Emacs, we just return the cons cell \(PROPERTY . COLOR).
+For Emacs, we just return the cons cell (PROPERTY . COLOR).
 For XEmacs, we create a temporary face and return it."
   (if (featurep 'xemacs)
       (let ((face (make-face (intern (concat color "-" (symbol-name property)))
@@ -530,9 +530,10 @@
     (nreverse codes)))
 
 (defun ansi-color-apply-sequence (escape-sequence codes)
-  "Apply ESCAPE-SEQ to CODES and return the new list of codes.
+  "Apply ESCAPE-SEQUENCE to CODES and return the new list of codes.
 
-ESCAPE-SEQ is an escape sequence parsed by `ansi-color-parse-sequence'.
+ESCAPE-SEQUENCE is an escape sequence parsed by
+`ansi-color-parse-sequence'.
 
 For each new code, the following happens: if it is 1-7, add it to
 the list of codes; if it is 21-25 or 27, delete appropriate
@@ -577,19 +578,19 @@
 
 The face definitions are based upon the variables
 `ansi-color-faces-vector' and `ansi-color-names-vector'."
-  (let ((ansi-color-map (make-vector 50 nil))
+  (let ((map (make-vector 50 nil))
         (index 0))
     ;; miscellaneous attributes
     (mapc
      (function (lambda (e)
-                 (aset ansi-color-map index e)
+                 (aset map index e)
                  (setq index (1+ index)) ))
      ansi-color-faces-vector)
     ;; foreground attributes
     (setq index 30)
     (mapc
      (function (lambda (e)
-                 (aset ansi-color-map index
+                 (aset map index
 		       (ansi-color-make-face 'foreground
                                              (if (consp e) (car e) e)))
                  (setq index (1+ index)) ))
@@ -598,12 +599,12 @@
     (setq index 40)
     (mapc
      (function (lambda (e)
-                 (aset ansi-color-map index
+                 (aset map index
 		       (ansi-color-make-face 'background
                                              (if (consp e) (cdr e) e)))
                  (setq index (1+ index)) ))
      ansi-color-names-vector)
-    ansi-color-map))
+    map))
 
 (defvar ansi-color-map (ansi-color-make-color-map)
   "A brand new color map suitable for `ansi-color-get-face'.
@@ -613,9 +614,9 @@
 numbers included in an SGR control sequences point to the correct
 foreground or background colors.
 
-Example: The sequence \033[34m specifies a blue foreground.  Therefore:
+Example: The sequence \\033[34m specifies a blue foreground.  Therefore:
      (aref ansi-color-map 34)
-          => \(foreground-color . \"blue\")")
+          => (foreground-color . \"blue\")")
 
 (defun ansi-color-map-update (symbol value)
   "Update `ansi-color-map'.
------------------------------------------------------------
revno: 113090
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Thu 2013-06-20 02:39:59 +0200
message:
  lisp/progmodes/prog-mode.el: Remove autoload cookies.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 22:28:04 +0000
+++ lisp/ChangeLog	2013-06-20 00:39:59 +0000
@@ -1,3 +1,8 @@
+2013-06-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* progmodes/prog-mode.el (prettify-symbols-mode)
+	(global-prettify-symbols-mode, prog-mode): Remove autoload cookies.
+
 2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/eww.el (eww-process-text-input): Display passwords as asterisks.

=== modified file 'lisp/progmodes/prog-mode.el'
--- lisp/progmodes/prog-mode.el	2013-06-18 22:13:25 +0000
+++ lisp/progmodes/prog-mode.el	2013-06-20 00:39:59 +0000
@@ -89,7 +89,6 @@
 
 (defvar-local prettify-symbols--keywords nil)
 
-;;;###autoload
 (define-minor-mode prettify-symbols-mode
   "Toggle Prettify Symbols mode.
 With a prefix argument ARG, enable Prettify Symbols mode if ARG is
@@ -132,11 +131,9 @@
              (local-variable-p 'prettify-symbols-alist))
     (prettify-symbols-mode 1)))
 
-;;;###autoload
 (define-globalized-minor-mode global-prettify-symbols-mode
   prettify-symbols-mode turn-on-prettify-symbols-mode)
 
-;;;###autoload
 (define-derived-mode prog-mode fundamental-mode "Prog"
   "Major mode for editing programming language source code."
   (setq-local require-final-newline mode-require-final-newline)
------------------------------------------------------------
revno: 113089
author: Gnus developers <ding@gnus.org.noreply>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Wed 2013-06-19 22:28:04 +0000
message:
  Merge changes made in Gnus master
  
  2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  * net/eww.el (eww-process-text-input): Display passwords as asterisks.
  * net/shr.el (shr-make-table-1): Protect against invalid column-spans.
  
  2013-06-19  Tom Tromey  <tromey@redhat.com>
  * net/eww.el (eww-top-url): Remove.
  (eww-home-url, eww-start-url, eww-contents-url): New defvars.
  (eww-render): Set new variables.  Don't set eww-top-url.
  (eww-handle-link): Handle "prev", "home", and "contents".
  Downcase the rel text.
  (eww-top-url): Choose best top URL.
  
  2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  * net/eww.el: Rewrite to implement form elements "by hand" instead of
  relying in widget.el.  Using widget.el leads to too many
  user interface inconsistencies.
  (eww-self-insert): Implement entering commands in text fields.
  (eww-process-text-input): New function to make text input field editing
  work.
  (eww-submit): Rewrite to use the new-style form methods.
  (eww-select-display): Display the correct selected item.
  (eww-change-select): Implement changing the select value.
  (eww-toggle-checkbox): Implement radio/checkboxes.
  (eww-update-field): Fix compilation error.
  (eww-tag-textarea): Implement <textarea>.
  * net/shr.el (shr-urlify): Use `keymap' instead of `local-map' so that we
  don't shadow mode-specific bindings.
  * net/eww.el (eww-browse-url): Don't push stuff onto history if there's
  nothing to push.
  * net/shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 20:27:49 +0000
+++ lisp/ChangeLog	2013-06-19 22:28:04 +0000
@@ -1,3 +1,41 @@
+2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/eww.el (eww-process-text-input): Display passwords as asterisks.
+
+	* net/shr.el (shr-make-table-1): Protect against invalid column-spans.
+
+2013-06-19  Tom Tromey  <tromey@redhat.com>
+
+	* net/eww.el (eww-top-url): Remove.
+	(eww-home-url, eww-start-url, eww-contents-url): New defvars.
+	(eww-render): Set new variables.  Don't set eww-top-url.
+	(eww-handle-link): Handle "prev", "home", and "contents".
+	Downcase the rel text.
+	(eww-top-url): Choose best top URL.
+
+2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/eww.el: Rewrite to implement form elements "by hand" instead of
+	relying in widget.el.  Using widget.el leads to too many
+	user interface inconsistencies.
+	(eww-self-insert): Implement entering commands in text fields.
+	(eww-process-text-input): New function to make text input field editing
+	work.
+	(eww-submit): Rewrite to use the new-style form methods.
+	(eww-select-display): Display the correct selected item.
+	(eww-change-select): Implement changing the select value.
+	(eww-toggle-checkbox): Implement radio/checkboxes.
+	(eww-update-field): Fix compilation error.
+	(eww-tag-textarea): Implement <textarea>.
+
+	* net/shr.el (shr-urlify): Use `keymap' instead of `local-map' so that
+	we don't shadow mode-specific bindings.
+
+	* net/eww.el (eww-browse-url): Don't push stuff onto history if there's
+	nothing to push.
+
+	* net/shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
+
 2013-06-19  Glenn Morris  <rgm@fencepost.gnu.org>
 
 	* emacs-lisp/eieio.el (defclass): Make it eval-and-compile once more.

=== modified file 'lisp/net/eww.el'
--- lisp/net/eww.el	2013-06-18 22:38:34 +0000
+++ lisp/net/eww.el	2013-06-19 22:28:04 +0000
@@ -43,11 +43,35 @@
   :group 'eww
   :type 'string)
 
-(defface eww-button
-  '((((type x w32 ns) (class color))	; Like default mode line
-     :box (:line-width 2 :style released-button)
-     :background "lightgrey" :foreground "black"))
-  "Face for eww buffer buttons."
+(defface eww-form-submit
+  '((((type x w32 ns) (class color))	; Like default mode line
+     :box (:line-width 2 :style released-button)
+     :background "#808080" :foreground "black"))
+  "Face for eww buffer buttons."
+  :version "24.4"
+  :group 'eww)
+
+(defface eww-form-checkbox
+  '((((type x w32 ns) (class color))	; Like default mode line
+     :box (:line-width 2 :style released-button)
+     :background "lightgrey" :foreground "black"))
+  "Face for eww buffer buttons."
+  :version "24.4"
+  :group 'eww)
+
+(defface eww-form-select
+  '((((type x w32 ns) (class color))	; Like default mode line
+     :box (:line-width 2 :style released-button)
+     :background "lightgrey" :foreground "black"))
+  "Face for eww buffer buttons."
+  :version "24.4"
+  :group 'eww)
+
+(defface eww-form-text
+  '((t (:background "#505050"
+		    :foreground "white"
+		    :box (:line-width 1))))
+  "Face for eww text inputs."
   :version "24.4"
   :group 'eww)
 
@@ -59,7 +83,9 @@
 (defvar eww-next-url nil)
 (defvar eww-previous-url nil)
 (defvar eww-up-url nil)
-(defvar eww-top-url nil)
+(defvar eww-home-url nil)
+(defvar eww-start-url nil)
+(defvar eww-contents-url nil)
 
 ;;;###autoload
 (defun eww (url)
@@ -82,7 +108,9 @@
   (set (make-local-variable 'eww-next-url) nil)
   (set (make-local-variable 'eww-previous-url) nil)
   (set (make-local-variable 'eww-up-url) nil)
-  (set (make-local-variable 'eww-top-url) nil)
+  (set (make-local-variable 'eww-home-url) nil)
+  (set (make-local-variable 'eww-start-url) nil)
+  (set (make-local-variable 'eww-contents-url) nil)
   (let* ((headers (eww-parse-headers))
 	 (shr-target-id
 	  (and (string-match "#\\(.*\\)" url)
@@ -154,6 +182,7 @@
     (setq eww-current-url url)
     (eww-update-header-line-format)
     (let ((inhibit-read-only t)
+	  (after-change-functions nil)
 	  (shr-width nil)
 	  (shr-external-rendering-functions
 	   '((title . eww-tag-title)
@@ -164,17 +193,28 @@
 	     (select . eww-tag-select)
 	     (link . eww-tag-link)
 	     (a . eww-tag-a))))
-      (shr-insert-document document)
-      (eww-convert-widgets))
+      (shr-insert-document document))
     (goto-char (point-min))))
 
 (defun eww-handle-link (cont)
   (let* ((rel (assq :rel cont))
   	(href (assq :href cont))
-	(where (assoc (cdr rel)
+	(where (assoc
+		;; The text associated with :rel is case-insensitive.
+		(if rel (downcase (cdr rel)))
 		      '(("next" . eww-next-url)
+			;; Texinfo uses "previous", but HTML specifies
+			;; "prev", so recognize both.
 			("previous" . eww-previous-url)
-			("start" . eww-top-url)
+			("prev" . eww-previous-url)
+			;; HTML specifies "start" but also "contents",
+			;; and Gtk seems to use "home".  Recognize
+			;; them all; but store them in different
+			;; variables so that we can readily choose the
+			;; "best" one.
+			("start" . eww-start-url)
+			("home" . eww-home-url)
+			("contents" . eww-contents-url)
 			("up" . eww-up-url)))))
     (and href
 	 where
@@ -218,10 +258,12 @@
       (when new-colors
 	(when fg
 	  (add-face-text-property start end
-				  (list :foreground (cadr new-colors))))
+				  (list :foreground (cadr new-colors))
+				  t))
 	(when bg
 	  (add-face-text-property start end
-				  (list :background (car new-colors))))))))
+				  (list :background (car new-colors))
+				  t))))))
 
 (defun eww-display-raw (charset)
   (let ((data (buffer-substring (point) (point-max))))
@@ -240,7 +282,6 @@
 (defun eww-setup-buffer ()
   (pop-to-buffer (get-buffer-create "*eww*"))
   (remove-overlays)
-  (setq widget-field-list nil)
   (let ((inhibit-read-only t))
     (erase-buffer))
   (eww-mode))
@@ -267,11 +308,16 @@
 
 \\{eww-mode-map}"
   (set (make-local-variable 'eww-current-url) 'author)
-  (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url))
+  (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url)
+  (set (make-local-variable 'after-change-functions) 'eww-process-text-input)
+  ;;(setq buffer-read-only t)
+  )
 
 (defun eww-browse-url (url &optional new-window)
-  (push (list eww-current-url (point))
-	eww-history)
+  (when (and (equal major-mode 'eww-mode)
+	     eww-current-url)
+    (push (list eww-current-url (point))
+	  eww-history))
   (eww url))
 
 (defun eww-quit ()
@@ -317,12 +363,15 @@
 
 (defun eww-top-url ()
   "Go to the page marked `top'.
-A page is marked `top' if rel=\"start\" appears in a <link>
-or <a> tag."
+A page is marked `top' if rel=\"start\", rel=\"home\", or rel=\"contents\"
+appears in a <link> or <a> tag."
   (interactive)
-  (if eww-top-url
-      (eww-browse-url (shr-expand-url eww-top-url eww-current-url))
-    (error "No `top' on this page")))
+  (let ((best-url (or eww-start-url
+		      eww-contents-url
+		      eww-home-url)))
+    (if best-url
+	(eww-browse-url (shr-expand-url best-url eww-current-url))
+      (error "No `top' for this page"))))
 
 (defun eww-reload ()
   "Reload the current page."
@@ -334,6 +383,71 @@
 
 (defvar eww-form nil)
 
+(defvar eww-submit-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\r" 'eww-submit)
+    map))
+
+(defvar eww-checkbox-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [space] 'eww-toggle-checkbox)
+    (define-key map "\r" 'eww-toggle-checkbox)
+    map))
+
+(defvar eww-text-map
+  (let ((map (make-keymap)))
+    (set-keymap-parent map text-mode-map)
+    (define-key map "\r" 'eww-submit)
+    (define-key map [(control a)] 'eww-beginning-of-text)
+    (define-key map [(control e)] 'eww-end-of-text)
+    (define-key map [tab] 'shr-next-link)
+    (define-key map [backtab] 'shr-previous-link)
+    map))
+
+(defvar eww-textarea-map
+  (let ((map (make-keymap)))
+    (set-keymap-parent map text-mode-map)
+    (define-key map "\r" 'forward-line)
+    (define-key map [tab] 'shr-next-link)
+    (define-key map [backtab] 'shr-previous-link)
+    map))
+
+(defvar eww-select-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\r" 'eww-change-select)
+    map))
+
+(defun eww-beginning-of-text ()
+  "Move to the start of the input field."
+  (interactive)
+  (goto-char (eww-beginning-of-field)))
+
+(defun eww-end-of-text ()
+  "Move to the end of the text in the input field."
+  (interactive)
+  (goto-char (eww-end-of-field))
+  (let ((start (eww-beginning-of-field)))
+    (while (and (equal (following-char) ? )
+		(> (point) start))
+      (forward-char -1))
+    (when (> (point) start)
+      (forward-char 1))))
+
+(defun eww-beginning-of-field ()
+  (cond
+   ((bobp)
+    (point))
+   ((not (eq (get-text-property (point) 'eww-form)
+	     (get-text-property (1- (point)) 'eww-form)))
+    (point))
+   (t
+    (previous-single-property-change
+     (point) 'eww-form nil (point-min)))))
+
+(defun eww-end-of-field ()
+  (1- (next-single-property-change
+       (point) 'eww-form nil (point-max))))
+
 (defun eww-tag-form (cont)
   (let ((eww-form
 	 (list (assq :method cont)
@@ -348,160 +462,334 @@
       (put-text-property start (1+ start)
 			 'eww-form eww-form))))
 
+(defun eww-form-submit (cont)
+  (let ((start (point))
+	(value (cdr (assq :value cont))))
+    (setq value
+	  (if (zerop (length value))
+	      "Submit"
+	    value))
+    (insert value)
+    (add-face-text-property start (point) 'eww-form-submit)
+    (put-text-property start (point) 'eww-form
+		       (list :eww-form eww-form
+			     :value value
+			     :type "submit"
+			     :name (cdr (assq :name cont))))
+    (put-text-property start (point) 'keymap eww-submit-map)
+    (insert " ")))
+
+(defun eww-form-checkbox (cont)
+  (let ((start (point)))
+    (if (cdr (assq :checked cont))
+	(insert "[X]")
+      (insert "[ ]"))
+    (add-face-text-property start (point) 'eww-form-checkbox)
+    (put-text-property start (point) 'eww-form
+		       (list :eww-form eww-form
+			     :value (cdr (assq :value cont))
+			     :type (downcase (cdr (assq :type cont)))
+			     :checked (cdr (assq :checked cont))
+			     :name (cdr (assq :name cont))))
+    (put-text-property start (point) 'keymap eww-checkbox-map)
+    (insert " ")))
+
+(defun eww-form-text (cont)
+  (let ((start (point))
+	(type (downcase (or (cdr (assq :type cont))
+			    "text")))
+	(value (or (cdr (assq :value cont)) ""))
+	(width (string-to-number
+		(or (cdr (assq :size cont))
+		    "40"))))
+    (insert value)
+    (when (< (length value) width)
+      (insert (make-string (- width (length value)) ? )))
+    (put-text-property start (point) 'face 'eww-form-text)
+    (put-text-property start (point) 'local-map eww-text-map)
+    (put-text-property start (point) 'inhibit-read-only t)
+    (put-text-property start (point) 'eww-form
+		       (list :eww-form eww-form
+			     :value value
+			     :type type
+			     :name (cdr (assq :name cont))))
+    (insert " ")))
+
+(defun eww-process-text-input (beg end length)
+  (let* ((form (get-text-property end 'eww-form))
+	 (properties (text-properties-at end))
+	 (type (plist-get form :type)))
+    (when (and form
+	       (member type '("text" "password" "textarea")))
+      (cond
+       ((zerop length)
+	;; Delete some space at the end.
+	(save-excursion
+	  (goto-char
+	   (if (equal type "textarea")
+	       (1- (line-end-position))
+	     (eww-end-of-field)))
+	  (let ((new (- end beg)))
+	    (while (and (> new 0)
+			(eql (following-char) ? ))
+	      (delete-region (point) (1+ (point)))
+	      (setq new (1- new))))
+	  (set-text-properties beg end properties)))
+       ((> length 0)
+	;; Add padding.
+	(save-excursion
+	  (goto-char
+	   (if (equal type "textarea")
+	       (1- (line-end-position))
+	     (eww-end-of-field)))
+	  (let ((start (point)))
+	    (insert (make-string length ? ))
+	    (set-text-properties start (point) properties)))))
+      (let ((value (buffer-substring-no-properties
+		    (eww-beginning-of-field)
+		    (eww-end-of-field))))
+	(when (string-match " +\\'" value)
+	  (setq value (substring value 0 (match-beginning 0))))
+	(plist-put form :value value)
+	(when (equal type "password")
+	  ;; Display passwords as asterisks.
+	  (let ((start (eww-beginning-of-field)))
+	    (put-text-property start (+ start (length value))
+			       'display (make-string (length value) ?*))))))))
+
+(defun eww-tag-textarea (cont)
+  (let ((start (point))
+	(value (or (cdr (assq :value cont)) ""))
+	(lines (string-to-number
+		(or (cdr (assq :rows cont))
+		    "10")))
+	(width (string-to-number
+		(or (cdr (assq :cols cont))
+		    "10")))
+	end)
+    (shr-ensure-newline)
+    (insert value)
+    (shr-ensure-newline)
+    (when (< (count-lines start (point)) lines)
+      (dotimes (i (- lines (count-lines start (point))))
+	(insert "\n")))
+    (setq end (point-marker))
+    (goto-char start)
+    (while (< (point) end)
+      (end-of-line)
+      (let ((pad (- width (- (point) (line-beginning-position)))))
+	(when (> pad 0)
+	  (insert (make-string pad ? ))))
+      (add-face-text-property (line-beginning-position)
+			      (point) 'eww-form-text)
+      (put-text-property (line-beginning-position) (point)
+			 'local-map eww-textarea-map)
+      (forward-line 1))
+    (put-text-property start (point) 'eww-form
+		       (list :eww-form eww-form
+			     :value value
+			     :type "textarea"
+			     :name (cdr (assq :name cont))))))
+
 (defun eww-tag-input (cont)
-  (let* ((start (point))
-	 (type (downcase (or (cdr (assq :type cont))
+  (let ((type (downcase (or (cdr (assq :type cont))
 			     "text")))
-	 (value (cdr (assq :value cont)))
-	 (widget
-	  (cond
-	   ((or (equal type "submit")
-		(equal type "image"))
-	    (list 'push-button
-		  :notify 'eww-submit
-		  :name (cdr (assq :name cont))
-		  :value (if (zerop (length value))
-			     "Submit"
-			   value)
-		  :eww-form eww-form
-		  (or (if (zerop (length value))
-			  "Submit"
-			value))))
-	   ((or (equal type "radio")
-		(equal type "checkbox"))
-	    (list 'checkbox
-		  :notify 'eww-click-radio
-		  :name (cdr (assq :name cont))
-		  :checkbox-value value
-		  :checkbox-type type
-		  :eww-form eww-form
-		  (cdr (assq :checked cont))))
-	   ((equal type "hidden")
-	    (list 'hidden
-		  :name (cdr (assq :name cont))
-		  :value value))
-	   (t
-	    (list 'editable-field
-		  :size (string-to-number
-			 (or (cdr (assq :size cont))
-			     "40"))
-		  :value (or value "")
-		  :secret (and (equal type "password") ?*)
-		  :action 'eww-submit
-		  :name (cdr (assq :name cont))
-		  :eww-form eww-form)))))
-    (nconc eww-form (list widget))
-    (unless (eq (car widget) 'hidden)
-      (apply 'widget-create widget)
-      (put-text-property start (point) 'eww-widget widget)
-      (insert " "))))
-
-(defun eww-tag-textarea (cont)
-  (let* ((start (point))
-	 (widget
-	  (list 'text
-		:size (string-to-number
-		       (or (cdr (assq :cols cont))
-			   "40"))
-		:value (or (cdr (assq 'text cont)) "")
-		:action 'eww-submit
-		:name (cdr (assq :name cont))
-		:eww-form eww-form)))
-    (nconc eww-form (list widget))
-    (apply 'widget-create widget)
-    (put-text-property start (point) 'eww-widget widget)))
+	(start (point)))
+    (cond
+     ((or (equal type "checkbox")
+	  (equal type "radio"))
+      (eww-form-checkbox cont))
+     ((equal type "submit")
+      (eww-form-submit cont))
+     ((equal type "hidden")
+      (let ((form eww-form)
+	    (name (cdr (assq :name cont))))
+	;; Don't add <input type=hidden> elements repeatedly.
+	(while (and form
+		    (or (not (consp (car form)))
+			(not (eq (caar form) 'hidden))
+			(not (equal (plist-get (cdr (car form)) :name)
+				    name))))
+	  (setq form (cdr form)))
+	(unless form
+	  (nconc eww-form (list
+			   (list 'hidden
+				 :name name
+				 :value (cdr (assq :value cont))))))))
+     (t
+      (eww-form-text cont)))
+    (unless (= start (point))
+      (put-text-property start (1+ start) 'help-echo "Input field"))))
 
 (defun eww-tag-select (cont)
   (shr-ensure-paragraph)
-  (let ((menu (list 'menu-choice
-		    :name (cdr (assq :name cont))
+  (let ((menu (list :name (cdr (assq :name cont))
 		    :eww-form eww-form))
 	(options nil)
-	(start (point)))
+	(start (point))
+	(max 0))
     (dolist (elem cont)
       (when (eq (car elem) 'option)
 	(when (cdr (assq :selected (cdr elem)))
 	  (nconc menu (list :value
 			    (cdr (assq :value (cdr elem))))))
-	(push (list 'item
-		    :value (cdr (assq :value (cdr elem)))
-		    :tag (cdr (assq 'text (cdr elem))))
-	      options)))
+	(let ((display (or (cdr (assq 'text (cdr elem))) "")))
+	  (setq max (max max (length display)))
+	  (push (list 'item
+		      :value (cdr (assq :value (cdr elem)))
+		      :display display)
+		options))))
     (when options
+      (setq options (nreverse options))
       ;; If we have no selected values, default to the first value.
-      (unless (plist-get (cdr menu) :value)
+      (unless (plist-get menu :value)
 	(nconc menu (list :value (nth 2 (car options)))))
       (nconc menu options)
-      (apply 'widget-create menu)
-      (put-text-property start (point) 'eww-widget menu)
+      (let ((selected (eww-select-display menu)))
+	(insert selected
+		(make-string (- max (length selected)) ? )))
+      (put-text-property start (point) 'eww-form menu)
+      (add-face-text-property start (point) 'eww-form-select)
+      (put-text-property start (point) 'keymap eww-select-map)
       (shr-ensure-paragraph))))
 
-(defun eww-click-radio (widget &rest ignore)
-  (let ((form (plist-get (cdr widget) :eww-form))
-	(name (plist-get (cdr widget) :name)))
-    (when (equal (plist-get (cdr widget) :type) "radio")
-      (if (widget-value widget)
-	  ;; Switch all the other radio buttons off.
-	  (dolist (overlay (overlays-in (point-min) (point-max)))
-	    (let ((field (plist-get (overlay-properties overlay) 'button)))
-	      (when (and (eq (plist-get (cdr field) :eww-form) form)
-			 (equal name (plist-get (cdr field) :name)))
-		(unless (eq field widget)
-		  (widget-value-set field nil)))))
-	(widget-value-set widget t)))
-    (eww-fix-widget-keymap)))
-
-(defun eww-submit (widget &rest ignore)
-  (let ((form (plist-get (cdr widget) :eww-form))
-	values)
-    (dolist (overlay (sort (overlays-in (point-min) (point-max))
-			   (lambda (o1 o2)
-			     (< (overlay-start o1) (overlay-start o2)))))
-      (let ((field (or (plist-get (overlay-properties overlay) 'field)
-		       (plist-get (overlay-properties overlay) 'button))))
-	(when (eq (plist-get (cdr field) :eww-form) form)
-	  (let ((name (plist-get (cdr field) :name)))
-	    (when name
-	      (cond
-	       ((eq (car field) 'checkbox)
-		(when (widget-value field)
-		  (push (cons name (plist-get (cdr field) :checkbox-value))
-			values)))
-	       ((eq (car field) 'push-button)
-		;; We want the values from buttons if we hit a button,
-		;; if it's the first button in the DOM after the field
-		;; hit ENTER on.
-		(when (and (eq (car widget) 'push-button)
-			   (eq widget field))
-		  (push (cons name (widget-value field))
-			values)))
-	       (t
-		(push (cons name (widget-value field))
-		      values))))))))
+(defun eww-select-display (select)
+  (let ((value (plist-get select :value))
+	display)
+    (dolist (elem select)
+      (when (and (consp elem)
+		 (eq (car elem) 'item)
+		 (equal value (plist-get (cdr elem) :value)))
+	(setq display (plist-get (cdr elem) :display))))
+    display))
+
+(defun eww-change-select ()
+  "Change the value of the select drop-down menu under point."
+  (interactive)
+  (let* ((input (get-text-property (point) 'eww-form))
+	 (properties (text-properties-at (point)))
+	 (completion-ignore-case t)
+	 (options
+	  (delq nil
+		(mapcar (lambda (elem)
+			  (and (consp elem)
+			       (eq (car elem) 'item)
+			       (cons (plist-get (cdr elem) :display)
+				     (plist-get (cdr elem) :value))))
+			input)))
+	 (display
+	  (completing-read "Change value: " options nil 'require-match))
+	 (inhibit-read-only t))
+    (plist-put input :value (cdr (assoc-string display options t)))
+    (goto-char
+     (eww-update-field display))))
+
+(defun eww-update-field (string)
+  (let ((properties (text-properties-at (point)))
+	(start (eww-beginning-of-field))
+	(end (1+ (eww-end-of-field))))
+    (delete-region start end)
+    (insert string
+	    (make-string (- (- end start) (length string)) ? ))
+    (set-text-properties start end properties)
+    start))
+
+(defun eww-toggle-checkbox ()
+  "Toggle the value of the checkbox under point."
+  (interactive)
+  (let* ((input (get-text-property (point) 'eww-form))
+	 (type (plist-get input :type)))
+    (if (equal type "checkbox")
+	(goto-char
+	 (1+
+	  (if (plist-get input :checked)
+	      (progn
+		(plist-put input :checked nil)
+		(eww-update-field "[ ]"))
+	    (plist-put input :checked t)
+	    (eww-update-field "[X]"))))
+      ;; Radio button.  Switch all other buttons off.
+      (let ((name (plist-get input :name)))
+	(save-excursion
+	  (dolist (elem (eww-inputs (plist-get input :eww-form)))
+	    (when (equal (plist-get (cdr elem) :name) name)
+	      (goto-char (car elem))
+	      (if (not (eq (cdr elem) input))
+		  (progn
+		    (plist-put input :checked nil)
+		    (eww-update-field "[ ]"))
+		(plist-put input :checked t)
+		(eww-update-field "[X]")))))
+	(forward-char 1)))))
+
+(defun eww-inputs (form)
+  (let ((start (point-min))
+	(inputs nil))
+    (while (and start
+		(< start (point-max)))
+      (when (or (get-text-property start 'eww-form)
+		(setq start (next-single-property-change start 'eww-form)))
+	(when (eq (plist-get (get-text-property start 'eww-form) :eww-form)
+		  form)
+	  (push (cons start (get-text-property start 'eww-form))
+		inputs))
+	(setq start (next-single-property-change start 'eww-form))))
+    (nreverse inputs)))
+
+(defun eww-input-value (input)
+  (let ((type (plist-get input :type))
+	(value (plist-get input :value)))
+    (cond
+     ((equal type "textarea")
+      (with-temp-buffer
+	(insert value)
+	(goto-char (point-min))
+	(while (re-search-forward "^ +\n\\| +$" nil t)
+	  (replace-match "" t t))
+	(buffer-string)))
+     (t
+      (if (string-match " +\\'" value)
+	  (substring value 0 (match-beginning 0))
+	value)))))
+
+(defun eww-submit ()
+  "Submit the current form."
+  (interactive)
+  (let* ((this-input (get-text-property (point) 'eww-form))
+	 (form (plist-get this-input :eww-form))
+	 values next-submit)
+    (dolist (elem (sort (eww-inputs form)
+			 (lambda (o1 o2)
+			   (< (car o1) (car o2)))))
+      (let* ((input (cdr elem))
+	     (input-start (car elem))
+	     (name (plist-get input :name)))
+	(when name
+	  (cond
+	   ((member (plist-get input :type) '("checkbox" "radio"))
+	    (when (plist-get input :checked)
+	      (push (cons name (plist-get input :value))
+		    values)))
+	   ((equal (plist-get input :type) "submit")
+	    ;; We want the values from buttons if we hit a button if
+	    ;; we hit enter on it, or if it's the first button after
+	    ;; the field we did hit return on.
+	    (when (or (eq input this-input)
+		      (and (not (eq input this-input))
+			   (null next-submit)
+			   (> input-start (point))))
+	      (setq next-submit t)
+	      (push (cons name (plist-get input :value))
+		    values)))
+	   (t
+	    (push (cons name (eww-input-value input))
+		  values))))))
     (dolist (elem form)
       (when (and (consp elem)
 		 (eq (car elem) 'hidden))
 	(push (cons (plist-get (cdr elem) :name)
 		    (plist-get (cdr elem) :value))
 	      values)))
-    ;; If we hit ENTER in a non-button field, include the value of the
-    ;; first submit button after it.
-    (unless (eq (car widget) 'push-button)
-      (let ((rest form)
-	    (name (plist-get (cdr widget) :name)))
-	(when rest
-	  (while (and rest
-		      (or (not (consp (car rest)))
-			  (not (equal name (plist-get (cdar rest) :name)))))
-	    (pop rest)))
-	(while rest
-	  (let ((elem (pop rest)))
-	    (when (and (consp (car rest))
-		       (eq (car elem) 'push-button))
-	      (push (cons (plist-get (cdr elem) :name)
-			  (plist-get (cdr elem) :value))
-		    values)
-	      (setq rest nil))))))
     (if (and (stringp (cdr (assq :method form)))
 	     (equal (downcase (cdr (assq :method form))) "post"))
 	(let ((url-request-method "POST")
@@ -519,41 +807,6 @@
 	"?"
 	(mm-url-encode-www-form-urlencoded values))))))
 
-(defun eww-convert-widgets ()
-  (let ((start (point-min))
-	widget)
-    ;; Some widgets come from different buffers (rendered for tables),
-    ;; so we need to nix out the list of widgets and recreate them.
-    (setq widget-field-list nil
-	  widget-field-new nil)
-    (while (setq start (if (get-text-property start 'eww-widget)
-			   start
-			 (next-single-property-change start 'eww-widget)))
-      (setq widget (get-text-property start 'eww-widget))
-      (goto-char start)
-      (let ((end (next-single-property-change start 'eww-widget)))
-	(dolist (overlay (overlays-in start end))
-	  (when (or (plist-get (overlay-properties overlay) 'button)
-		    (plist-get (overlay-properties overlay) 'field))
-	    (delete-overlay overlay)))
-	(delete-region start end))
-      (when (and widget
-		 (not (eq (car widget) 'hidden)))
-	(apply 'widget-create widget)
-	(put-text-property start (point) 'help-echo
-			   (if (memq (car widget) '(text editable-field))
-			       "Input field"
-			     "Button"))
-	(when (eq (car widget) 'push-button)
-	  (add-face-text-property start (point) 'eww-button t))))
-    (widget-setup)
-    (eww-fix-widget-keymap)))
-
-(defun eww-fix-widget-keymap ()
-  (dolist (overlay (overlays-in (point-min) (point-max)))
-    (when (plist-get (overlay-properties overlay) 'button)
-      (overlay-put overlay 'local-map widget-keymap))))
-
 (provide 'eww)
 
 ;;; eww.el ends here

=== modified file 'lisp/net/shr.el'
--- lisp/net/shr.el	2013-06-18 22:38:34 +0000
+++ lisp/net/shr.el	2013-06-19 22:28:04 +0000
@@ -136,6 +136,7 @@
     (define-key map "z" 'shr-zoom-image)
     (define-key map [tab] 'shr-next-link)
     (define-key map [backtab] 'shr-previous-link)
+    (define-key map [follow-link] 'mouse-face)
     (define-key map "I" 'shr-insert-image)
     (define-key map "u" 'shr-copy-url)
     (define-key map "v" 'shr-browse-url)
@@ -818,7 +819,7 @@
    start (point)
    (list 'shr-url url
 	 'help-echo (if title (format "%s (%s)" url title) url)
-	 'local-map shr-map)))
+	 'keymap shr-map)))
 
 (defun shr-encode-url (url)
   "Encode URL."
@@ -1462,6 +1463,9 @@
 		(aset rowspans i (+ (aref rowspans i)
 				    (1- (string-to-number
 					 (cdr (assq :rowspan (cdr column))))))))
+	      ;; Sanity check for invalid column-spans.
+	      (when (>= width-column (length widths))
+		(setq width-column 0))
 	      (setq width
 		    (if column
 			(aref widths width-column)
------------------------------------------------------------
revno: 113088
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 16:29:09 -0400
message:
  * lisp/cedet/semantic/idle.el (define-semantic-idle-service):
  No need to use eval-and-compile, progn will do.
  (eval-and-compile ends up causing spurious warnings.)
diff:
=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2013-06-19 20:10:57 +0000
+++ lisp/cedet/ChangeLog	2013-06-19 20:29:09 +0000
@@ -1,4 +1,7 @@
-2013-06-19  Glenn Morris  <rgm@gnu.org>
+2013-06-19  Glenn Morris  <rgm@fencepost.gnu.org>
+
+	* semantic/idle.el (define-semantic-idle-service):
+	No need to use eval-and-compile, progn will do.
 
 	* semantic/decorate/mode.el (define-semantic-decoration-style):
 	Doc fix.

=== modified file 'lisp/cedet/semantic/idle.el'
--- lisp/cedet/semantic/idle.el	2013-06-02 13:33:09 +0000
+++ lisp/cedet/semantic/idle.el	2013-06-19 20:29:09 +0000
@@ -578,7 +578,7 @@
 	(setup	(intern (concat (symbol-name name) "-mode-setup")))
 	(func	(intern (concat (symbol-name name) "-idle-function"))))
 
-    `(eval-and-compile
+    `(progn
        (define-minor-mode ,global
 	 ,(concat "Toggle " (symbol-name global) ".
 With ARG, turn the minor mode on if ARG is positive, off otherwise.
------------------------------------------------------------
revno: 113087
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 16:27:49 -0400
message:
  * lisp/emacs-lisp/eieio.el (defclass): Make it eval-and-compile once more.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 20:10:57 +0000
+++ lisp/ChangeLog	2013-06-19 20:27:49 +0000
@@ -1,3 +1,7 @@
+2013-06-19  Glenn Morris  <rgm@fencepost.gnu.org>
+
+	* emacs-lisp/eieio.el (defclass): Make it eval-and-compile once more.
+
 2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is

=== modified file 'lisp/emacs-lisp/eieio.el'
--- lisp/emacs-lisp/eieio.el	2013-06-02 16:39:32 +0000
+++ lisp/emacs-lisp/eieio.el	2013-06-19 20:27:49 +0000
@@ -115,7 +115,12 @@
 
 Due to the way class options are set up, you can add any tags you wish,
 and reference them using the function `class-option'."
-  `(eieio-defclass ',name ',superclass ',slots ',options-and-doc))
+  ;; This is eval-and-compile only to silence spurious compiler warnings
+  ;; about functions and variables not known to be defined.
+  ;; When eieio-defclass code is merged here and this becomes
+  ;; transparent to the compiler, the eval-and-compile can be removed.
+  `(eval-and-compile
+     (eieio-defclass ',name ',superclass ',slots ',options-and-doc)))
 
 
 ;;; CLOS style implementation of object creators.
------------------------------------------------------------
revno: 113086
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Wed 2013-06-19 22:10:57 +0200
message:
  Fix typos in ChangeLogs.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2013-06-19 14:27:21 +0000
+++ ChangeLog	2013-06-19 20:10:57 +0000
@@ -4,7 +4,7 @@
 
 2013-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
-	Use functions, not macros, for XINT etc. (Bug#11935).
+	Use functions, not macros, for XINT etc.  (Bug#11935).
 	* configure.ac (WARN_CFLAGS): Remove -Wbad-function-cast,
 	as it generates bogus warnings about reasonable casts of calls.
 
@@ -397,7 +397,7 @@
 
 2013-01-23  Giorgos Keramidas  <gkeramidas@gmail.com>  (tiny change)
 
-	* .bzrignore: add lib-src/blessmail.
+	* .bzrignore: Add lib-src/blessmail.
 
 2013-01-23  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -546,7 +546,7 @@
 
 2012-12-10  Daniel Colascione  <dancol@dancol.org>
 
-	* .bzrignore: add src/emacs.res.
+	* .bzrignore: Add src/emacs.res.
 
 	* configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
 	build how to compile Windows resource files; use these variables

=== modified file 'admin/ChangeLog'
--- admin/ChangeLog	2013-06-15 13:21:17 +0000
+++ admin/ChangeLog	2013-06-19 20:10:57 +0000
@@ -6,7 +6,7 @@
 
 	* admin.el (manual-style-string): Use new file manual.css.
 
-2013-06-02  Eric Ludlam <zappo@gnu.org>
+2013-06-02  Eric Ludlam  <zappo@gnu.org>
 
 	* grammars/srecode-template.wy (variable): Accept a single number
 	as a variable value.  Allows the 'priority' to be set to a number.
@@ -158,7 +158,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-	Fix permissions bugs with setgid directories etc. (Bug#13125)
+	Fix permissions bugs with setgid directories etc.  (Bug#13125)
 	* CPP-DEFINES (BSD4_2): Remove.
 
 2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
@@ -290,7 +290,7 @@
 
 	* grammars/grammar.wy (semantic-grammar-lexer): Remove, since it
 	was copied to grammar.el.  New %provide token to generate prefix
-	which conforms with Emacs conventions.	Remove lexer definition,
+	which conforms with Emacs conventions.  Remove lexer definition,
 	which is now in grammar.el.
 
 2012-09-27  Glenn Morris  <rgm@gnu.org>

=== modified file 'doc/lispintro/ChangeLog'
--- doc/lispintro/ChangeLog	2013-06-19 03:49:26 +0000
+++ doc/lispintro/ChangeLog	2013-06-19 20:10:57 +0000
@@ -33,7 +33,7 @@
 	* emacs-lisp-intro.texi (defcustom, defun)
 	(simplified-beginning-of-buffer, defvar, Building Robots, Review)
 	(save-excursion): `defun' and `defcustom' are now macros rather
-	than special forms. (Bug#13853)
+	than special forms.  (Bug#13853)
 
 2013-03-16  Glenn Morris  <rgm@gnu.org>
 
@@ -53,7 +53,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-	Fix permissions bugs with setgid directories etc. (Bug#13125)
+	Fix permissions bugs with setgid directories etc.  (Bug#13125)
 	* emacs-lisp-intro.texi (Files List):
 	directory-files-and-attributes now outputs t for attribute that's
 	now a placeholder.

=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2013-06-19 13:21:15 +0000
+++ doc/misc/ChangeLog	2013-06-19 20:10:57 +0000
@@ -16,7 +16,7 @@
 
 2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
 
-	* sieve.texi: (Managing Sieve): Fix port in example, fix documentation
+	* sieve.texi (Managing Sieve): Fix port in example, fix documentation
 	for keys q and Q.
 	(Standards): Reference RFC5804 as the defining document of the
 	managesieve protocol.
@@ -62,7 +62,7 @@
 
 2013-03-31  Jay Belanger  <jay.p.belanger@gmail.com>
 
-	* calc.texi: (Basic Operations on Units): Streamline some
+	* calc.texi (Basic Operations on Units): Streamline some
 	descriptions.
 
 2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
@@ -517,7 +517,7 @@
 
 	Release MH-E manual version 8.4.
 
-	* mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
+	* mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
 	Update for release 8.4.
 
 	* mh-e.texi (Sequences): Add mh-whitelist-preserves-sequences-flag.
@@ -579,8 +579,8 @@
 	* ses.texi: Doc for ses-rename-cell, ses-repair-cell-reference-all & ses-range.
 	In all file place SES into @acronym{...}.
 	(Advanced Features): Add key index and function index for
-	ses-set-header-row. Add description for function
-	ses-rename-cell. Add description for function
+	ses-set-header-row.  Add description for function
+	ses-rename-cell.  Add description for function
 	ses-repair-cell-reference-all.
 	(Ranges in formulas): Add description for ses-range flags.
 
@@ -973,7 +973,7 @@
 
 	* org.texi: The sections in the Exporting section of the manual
 	left out articles in the description of the org-export-as-*
-	commands, among other places. This patch adds them, adds a few
+	commands, among other places.  This patch adds them, adds a few
 	missing prepositions, and switches instances of "an HTML" to "a
 	html" for internal consistency.
 
@@ -1021,7 +1021,7 @@
 2012-09-30  Nicolas Goaziou  <n.goaziou@gmail.com>
 
 	* org.texi (Literal examples): Remove reference to unknown
-	`org-export-latex-minted' variable. Also simplify footnote since
+	`org-export-latex-minted' variable.  Also simplify footnote since
 	`org-export-latex-listings' documentation is exhaustive already.
 
 	* org.texi (Plain lists): Remove reference to now hard-coded
@@ -1062,12 +1062,12 @@
 	simplifications.
 	(Basic Simplifications): Rename from "Limited Simplifications"
 	Replace "limited" by "basic" throughout.
-	(Algebraic Simplifications):  Indicate that the algebraic
+	(Algebraic Simplifications): Indicate that the algebraic
 	simplifications are done by default.
-	(Unsafe Simplifications):  Mention `m E'.
+	(Unsafe Simplifications): Mention `m E'.
 	(Simplification of Units): Mention `m U'.
 	(Trigonometric/Hyperbolic Functions, Reducing and Mapping)
-	(Kinds of Declarations, Functions for Declarations):  Mention
+	(Kinds of Declarations, Functions for Declarations): Mention
 	"algebraic simplifications" instead of `a s'.
 	(Algebraic Entry): Remove mention of default simplifications.
 

=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2013-06-18 22:13:25 +0000
+++ etc/ChangeLog	2013-06-19 20:10:57 +0000
@@ -18,10 +18,10 @@
 
 	* NEWS: Document eshell visual subcommands and options.
 
-2013-06-02  Eric Ludlam <zappo@gnu.org>
+2013-06-02  Eric Ludlam  <zappo@gnu.org>
 
 	* srecode/c.srt (header_guard): Add :c parameter so it works
-	standalone
+	standalone.
 
 2013-06-01  Alex Ott  <alexott@gmail.com>
 
@@ -35,7 +35,7 @@
 
 	* refcards/refcard.tex: Refine some entries.  (Bug#14087)
 
-	* refcards/dired-ref.tex: Refine some entries. (Bug#14072)
+	* refcards/dired-ref.tex: Refine some entries.  (Bug#14072)
 
 2013-05-24  Fabrice Niessen  <fni@missioncriticalit.com>
 
@@ -51,7 +51,7 @@
 
 2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 
-	Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+	Use Gnulib ACL implementation, for benefit of Solaris etc.  (Bug#14295)
 	* NEWS: Emacs is no longer limited to POSIX ACLs.  --disable-acl,
 	not --without-acl, since we're now using Gnulib's implementation.
 
@@ -123,7 +123,7 @@
 
 	* srecode/c.srt (header_guard): Upcase the filename symbol.
 
-2013-03-21  Vladimir Kazanov <vkazanov@inbox.ru>
+2013-03-21  Vladimir Kazanov  <vkazanov@inbox.ru>
 
 	* srecode/java.srt (empty-main): New.
 	(class-tag): Decapitalize class.
@@ -213,7 +213,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-	Fix permissions bugs with setgid directories etc. (Bug#13125)
+	Fix permissions bugs with setgid directories etc.  (Bug#13125)
 	* NEWS: Document changes to file-attributes,
 	file-ownership-preserved-p.
 	Mention new functions group-gid, group-real-gid.
@@ -519,7 +519,7 @@
 2012-04-01  Jambunathan K  <kjambunathan@gmail.com>
 
 	* org/OrgOdtContentTemplate.xml (OrgIndentedSection-Level-*):
-	New section styles. These sections are indented to the same
+	New section styles.  These sections are indented to the same
 	level as the corresponding list entries.  These sections hold
 	tables that occur within a list.  (OrgTable):
 	Increased relative width from 90% to 96% for aesthetic reasons.
@@ -685,7 +685,7 @@
 
 2011-08-24  Steve Chapel  <schapel@laptop.stevechapel.com>  (tiny change)
 
-	* refcards/refcard.tex: Add a few more commands. (Bug#9343)
+	* refcards/refcard.tex: Add a few more commands.  (Bug#9343)
 
 2011-08-22  Juri Linkov  <juri@jurta.org>
 
@@ -3885,7 +3885,7 @@
 
 2005-10-10  Jan Djärv  <jan.h.d@swipnet.se>
 
-	* NEWS: -nb => -nbi
+	* NEWS: -nb => -nbi.
 
 2005-10-10  Carsten Dominik  <dominik@science.uva.nl>
 

=== modified file 'leim/ChangeLog'
--- leim/ChangeLog	2013-05-25 16:05:19 +0000
+++ leim/ChangeLog	2013-06-19 20:10:57 +0000
@@ -1,7 +1,7 @@
 2013-05-25  Eli Zaretskii  <eliz@gnu.org>
 
-	* Makefile.in (leim-list.el, check-declare): Replace
-	reveal-filename with unmsys--file-name.
+	* Makefile.in (leim-list.el, check-declare):
+	Replace reveal-filename with unmsys--file-name.
 
 2013-05-16  Eli Zaretskii  <eliz@gnu.org>
 
@@ -2196,7 +2196,7 @@
 
 	* quail/cyrillic.el: For each package, pass t for the SIMPLE
 	argument to quail-define-package.
-	* quail/cyril-jis.el: Likewise
+	* quail/cyril-jis.el: Likewise.
 	* quail/greek.el: Likewise.
 	* quail/ipa.el: Likewise.
 	* quail/lao.el: Likewise.

=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2013-05-29 16:48:42 +0000
+++ lib-src/ChangeLog	2013-06-19 20:10:57 +0000
@@ -717,7 +717,7 @@
 	to avoid potential buffer overflow issues on typical 64-bit hosts.
 	(whatlen_max): New static var.
 	(main): Avoid buffer overflow if subsidiary command length is
-	greater than BUFSIZ or 2*BUFSIZ + 20. Do not use sprintf when its
+	greater than BUFSIZ or 2*BUFSIZ + 20.  Do not use sprintf when its
 	result might not fit in 'int'.
 
 	* movemail.c (main): Do not use sprintf when its result might not fit
@@ -8408,7 +8408,7 @@
 
 1988-12-31  Richard Mlynarik  (mly@rice-chex.ai.mit.edu)
 
-	* env.c: Add decl for my-index
+	* env.c: Add decl for my-index.
 	* etags.c (file-entries): .oak => scheme.
 
 1988-12-30  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 13:14:24 +0000
+++ lisp/ChangeLog	2013-06-19 20:10:57 +0000
@@ -890,7 +890,7 @@
 	(eieiomt-optimizing-obarray, eieiomt-install)
 	(eieiomt-add, eieiomt-next, eieiomt-sym-optimize)
 	(eieio-generic-form, eieio-defmethod, make-obsolete)
-	(eieio-defgeneric, make-obsolete): Move to eieio-core.el
+	(eieio-defgeneric, make-obsolete): Move to eieio-core.el.
 	(defclass): Remove `eval-and-compile' from macro.
 	(call-next-method, shared-initialize): Instead of using
 	`scoped-class' variable, use new eieio--scoped-class, and
@@ -900,8 +900,8 @@
 
 	* emacs-lisp/eieio-core.el: New file.  Derived from key parts of
 	eieio.el.
-	(eieio--scoped-class-stack): New variable
-	(eieio--scoped-class): New fcn
+	(eieio--scoped-class-stack): New variable.
+	(eieio--scoped-class): New fcn.
 	(eieio--with-scoped-class): New scoping macro.
 	(eieio-defclass): Use pushnew instead of add-to-list.
 	(eieio-defgeneric-form-primary-only-one, eieio-oset-default)
@@ -1614,9 +1614,9 @@
 	* progmodes/octave.el (octave-auto-fill): Remove.
 	(octave-indent-new-comment-line): Improve.
 	(octave-mode): Use auto fill mode through
-	comment-line-break-function and fill-nobreak-predicate
+	comment-line-break-function and fill-nobreak-predicate.
 	(octave-goto-function-definition): Support DEFUN_DLD.
-	(octave-beginning-of-defun): Small Tweak
+	(octave-beginning-of-defun): Small tweak.
 	(octave-help): Show parent directory.
 
 2013-05-21  Glenn Morris  <rgm@gnu.org>
@@ -2801,7 +2801,7 @@
 	Fix pack/unpack coding.  Reported by David Smith <davidsmith@acm.org>.
 
 	* net/tramp-compat.el (tramp-compat-call-process): Move function ...
-	* net/tramp.el (tramp-call-process): ... here
+	* net/tramp.el (tramp-call-process): ... here.
 	(tramp-set-completion-function, tramp-parse-putty):
 	* net/tramp-adb.el (tramp-adb-execute-adb-command):
 	* net/tramp-gvfs.el (tramp-gvfs-send-command):

=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2013-06-19 07:28:47 +0000
+++ lisp/cedet/ChangeLog	2013-06-19 20:10:57 +0000
@@ -10,7 +10,7 @@
 	* semantic/ctxt.el (semantic-ctxt-end-of-symbol-default):
 	Remove unused free variable `symlist'.
 
-2013-06-02  Eric Ludlam <zappo@gnu.org>
+2013-06-02  Eric Ludlam  <zappo@gnu.org>
 
 	* semantic/edit.el (semantic-change-function):
 	Use `save-match-data' around running hooks.
@@ -59,7 +59,7 @@
 	of code tags.
 
 	* srecode/compile.el (srecode-compile-templates): Fix warning
-	punctuation.  Remove status messages to clean up testing output
+	punctuation.  Remove status messages to clean up testing output.
 
 	* ede/base.el (ede-project-placeholder-cache-file): Update doc to
 	mention 'nil' value.
@@ -77,7 +77,7 @@
 	custom symbols representing a compiler or linker instead of
 	restricting things to only the predefined compilers and linkers.
 
-2013-06-02  David Engster <dengste@eml.cc>
+2013-06-02  David Engster  <dengste@eml.cc>
 
 	* semantic.el (semantic-mode-map): To avoid showing showing
 	Development menu twice, only disable menu item if menu-bar is
@@ -183,7 +183,7 @@
 	(semantic-analyze-dereference-metatype-stack): Use
 	`semantic-tag-similar-p' instead of 'eq' when comparing two tags
 	during metatype evaluation in case they are the same, but not the
-	same node. (Tweaked patch from Tomasz Gajewski) (Tiny change)
+	same node.  (Tweaked patch from Tomasz Gajewski) (Tiny change)
 
 	* semantic/db-find.el (semanticdb-partial-synchronize): Fix
 	require to semantic/db-typecache to be correct.
@@ -216,7 +216,7 @@
 	no spp symbols from it, say so.
 
 	* srecode/args.el (srecode-semantic-handle-:project): New argument
-	handler. Provide variable values if not in an EDE project.
+	handler.  Provide variable values if not in an EDE project.
 
 	* srecode/srt-mode.el (srecode-template-mode): Fix typo on srecode
 	name.
@@ -230,11 +230,11 @@
 
 	* srecode/srt.el: Add local variables for setting the autoload
 	file name.
-	(srecode-semantic-handle-:srt): New autoload cookie
+	(srecode-semantic-handle-:srt): New autoload cookie.
 
 	* ede.el (ede-apply-preprocessor-map): Apply map to
 	`semantic-lex-spp-project-macro-symbol-obarray' instead of the
-	system one. Add require for semantic.
+	system one.  Add require for semantic.
 
 	* ede/proj-elisp.el (ede-update-version-in-source): In case a file
 	has both a version variable and a Version: comment, always use
@@ -298,19 +298,19 @@
 	`class-parents' to `eieio-class-parents', `class-children' to
 	`eieio-class-children', `object-name-string' to
 	`eieio-object-name-string', `object-class-fast' to
-	`eieio--object-class'. Also replace direct access with new
+	`eieio--object-class'.  Also replace direct access with new
 	accessor functions.
 
-2013-03-21  Tomasz Gajewski <tomga@wp.pl> (tiny change)
+2013-03-21  Tomasz Gajewski  <tomga@wp.pl>  (tiny change)
 
 	* ede/cpp-root.el (ede-project-autoload, initialize-instance): Fix
 	EDE file symbol to match rename.  Fix ede-cpp-root symbol to
 	include -project in name.
 
-2013-03-21  Alex Ott <alexott@gmail.com>
+2013-03-21  Alex Ott  <alexott@gmail.com>
 
 	* cedet-files.el (cedet-files-list-recursively): New.  Recursively
-	find files whose names are matching to given regex
+	find files whose names are matching to given regex.
 
 	* ede.el (ede-current-project): Rewrite to avoid imperative style.
 
@@ -326,7 +326,7 @@
 	Value of slot or local variable could be string or function that
 	receives project and should return string that will be invoked as
 	command.
-	(project-compile-target): Invokes compilation of whole project
+	(project-compile-target): Invokes compilation of whole project.
 
 	* ede/files.el (ede-find-project-root): New function to
 	find root of project that contains specific file.
@@ -408,7 +408,7 @@
 	* semantic/db-el.el:
 	* semantic/chart.el: Fix requires.
 
-	* ede/locate.el: Remove useless requires. Declare functions
+	* ede/locate.el: Remove useless requires.  Declare functions
 	instead and require in functions when needed.
 
 2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -725,7 +725,7 @@
 	(srecode-mode-table): Add new modetables slot.
 	(srecode-get-mode-table): Find the mode, but also find all parent
 	modes, and merge the tables together in :tables from :modetables.
-	(srecode-make-mode-table): Init :modetables
+	(srecode-make-mode-table): Init :modetables.
 	(srecode-mode-table-find): Search in modetables.
 	(srecode-mode-table-new): Merge the differet files into the
 	modetables slot.
@@ -783,7 +783,7 @@
 	regular expression parsing.
         (semantic-cpp-lexer): Add semantic-lex-c-ifdef.
 	(semantic-expand-c-tag): Check if tag is non-nil before adding it
-	to return list
+	to return list.
 	(semantic-expand-c-extern-C, semantic-expand-c-complex-type):
 	New functions, copied from semantic-expand-c-tag.
 	(semantic-find-tags-included): New override which also searches
@@ -1294,9 +1294,9 @@
 2010-09-29  Eric Ludlam  <zappo@gnu.org>
 
 	* semantic/lex-spp.el (semantic-lex-spp-debug-symbol): New var.
-	(semantic-lex-spp-enable-debug-symbol): New command
+	(semantic-lex-spp-enable-debug-symbol): New command.
 	(semantic-lex-spp-value-valid-p)
-	(semantic-lex-spp-validate-value): New functions
+	(semantic-lex-spp-validate-value): New functions.
 	(semantic-lex-spp-symbol-set)
 	(semantic-lex-spp-symbol-push): Add call to validate value.
 	(semantic-lex-spp-table-write-slot-value): Instead of erroring on
@@ -1464,7 +1464,7 @@
 	(project-am-expand-subdirlist): New function.
 	(project-am-makefile::project-rescan): Use it.  Combine SUBDIRS
 	and DIST_SUBDIRS.
-	(project-am-meta-type-alist): A list to scan better Makefile.am
+	(project-am-meta-type-alist): A list to scan better Makefile.am.
 	(project-am-scan-for-targets): Scan also over
 	project-am-meta-type-alist.
 	(ede-system-include-path): Simple implementation.

=== modified file 'lisp/erc/ChangeLog'
--- lisp/erc/ChangeLog	2013-05-30 03:19:04 +0000
+++ lisp/erc/ChangeLog	2013-06-19 20:10:57 +0000
@@ -141,7 +141,7 @@
 	* erc-page.el (erc-page-function):
 	* erc-stamp.el (erc-stamp): Doc fix.
 
-2012-08-21  Josh Feinstein <jlf@foxtail.org>
+2012-08-21  Josh Feinstein  <jlf@foxtail.org>
 
 	* erc-join.el (erc-autojoin-timing): Fix defcustom type.
 
@@ -151,7 +151,7 @@
 	Use `erc-match-exclude-server-buffer' not
 	`erc-track-exclude-server-buffer'.
 
-2012-08-20  Josh Feinstein <jlf@foxtail.org>
+2012-08-20  Josh Feinstein  <jlf@foxtail.org>
 
 	* erc.el (erc-display-message): Abstract message hiding decision
 	to new function erc-hide-current-message-p.

=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2013-06-19 07:23:06 +0000
+++ lisp/gnus/ChangeLog	2013-06-19 20:10:57 +0000
@@ -135,7 +135,7 @@
 	(eww-update-header-line-format): New function.
 	(eww-tag-title): New function.
 
-	* shr.el (shr-dom-to-xml): (shr-dom-to-xml): New function.
+	* shr.el (shr-dom-to-xml): New function.
 	(shr-tag-svg): Add support for the SVG tag.
 	(shr-bullet): New custom variable.
 	(shr-tag-li): Support custom bullet in unordered lists.
@@ -230,7 +230,7 @@
 
 	* sieve-manage.el (sieve-manage-open): Work with STARTTLS: shorten
 	stream managing functions by using open-protocol-stream to do most of
-	the work. Has the nice benefit of enabling STARTTLS.
+	the work.  Has the nice benefit of enabling STARTTLS.
 	Wait for capabilities after STARTTLS: following RFC5804, the server
 	sends new capabilities after successfully establishing a TLS connection
 	with the client. The client should update the cached list of
@@ -281,10 +281,10 @@
 2013-06-10  Albert Krewinkel  <krewinkel@moltkeplatz.de>
 
 	* sieve.el: Put point at beginning of buffer when viewing a script.
-	(sieve-open-server): respect the PORT parameter. Show the correct port
-	number in sieve-buffer's header. Fixed code to also work with a string
-	as port specifier. Properly close the connection on pressing 'q'. Make
-	sieve-manage-quit close the connection and process buffer. Also, remove
+	(sieve-open-server): Respect the PORT parameter.  Show the correct port
+	number in sieve-buffer's header.  Fixed code to also work with a string
+	as port specifier. Properly close the connection on pressing 'q'.  Make
+	sieve-manage-quit close the connection and process buffer.  Also, remove
 	duplicate keybinding for 'q'.
 
 2013-06-10  Roy Hashimoto  <roy.hashimoto@gmail.com>  (tiny change)
@@ -528,7 +528,7 @@
 	(nnir-request-update-info): Improve marks updating.
 	(nnir-request-scan): Don't duplicate marks updating.
 	(gnus-group-make-nnir-group, nnir-run-imap, nnir-request-create-group):
-	Use 'assq rather than 'assoc. Quote anonymous function.
+	Use 'assq rather than 'assoc.  Quote anonymous function.
 	(nnir-request-group, nnir-close-group, gnus-summary-create-nnir-group):
 	Use 'gnus-group-prefixed-p.
 	(gnus-summary-create-nnir-group): Make sure server for method is open.
@@ -586,13 +586,13 @@
 	buffer use the posting-style and gcc of the original article group.
 	(gnus-inews-insert-gcc): Don't set gcc-self for virtual groups.
 
-	* nnir.el: Fix byte-compile warning. nnoo-define-skeleton should come
+	* nnir.el: Fix byte-compile warning.  nnoo-define-skeleton should come
 	after other deffoos.
 
 2013-03-26  Andrew Cohen  <cohen@bu.edu>
 
-	* nnir.el: Major rewrite. Cleaner separation between searches and group
-	management. Marks are now shown in nnir summary buffers. Rudimentary
+	* nnir.el: Major rewrite.  Cleaner separation between searches and group
+	management.  Marks are now shown in nnir summary buffers.  Rudimentary
 	support for real (i.e. not ephemeral) nnir groups.
 	(gnus-summary-make-nnir-group): New function for initiating searches
 	from a summary buffer.
@@ -798,9 +798,9 @@
 
 2012-12-25  Adam Sjøgren  <asjo@koldfront.dk>
 
-	* mml2015.el (mml2015-epg-key-image): use --attribute-fd rather than
-	temporary file to get PGP key image. Pass no-show-photos when extracting
-	image to avoid having it pop up twice.
+	* mml2015.el (mml2015-epg-key-image): Use --attribute-fd rather than
+	temporary file to get PGP key image.  Pass no-show-photos when
+	extracting image to avoid having it pop up twice.
 
 2012-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -1324,7 +1324,7 @@
 
 2012-08-10  Daiki Ueno  <ueno@unixuser.org>
 
-	* auth-source.el: (auth-source-plstore-search)
+	* auth-source.el (auth-source-plstore-search)
 	(auth-source-secrets-search): Ignore :require and :type in search spec.
 
 2012-08-06  Julien Danjou  <julien@danjou.info>
@@ -10021,7 +10021,7 @@
 
 2010-08-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* gnus-html.el: require mm-url.
+	* gnus-html.el: Require mm-url.
 	(gnus-html-wash-tags): Clarify the code a bit by renaming the variable
 	with the url to `url'.
 	(gnus-html-wash-tags): Support cid: URLs/images.

=== modified file 'lisp/mh-e/ChangeLog'
--- lisp/mh-e/ChangeLog	2013-06-18 20:24:44 +0000
+++ lisp/mh-e/ChangeLog	2013-06-19 20:10:57 +0000
@@ -103,7 +103,7 @@
 
 2012-11-25  Ted Phelps  <phelps@gnusto.com>
 
-	Postpone junk processing (closes SF #2945712). Patch submitted by
+	Postpone junk processing (closes SF #2945712).  Patch submitted by
 	Ted Phelps and refined by Bill Wohler.
 
 	* mh-e.el (mh-blacklist, mh-whitelist): New variables.
@@ -111,7 +111,7 @@
 	(mh-before-commands-processed-hook): Update documentation.
 	(mh-blacklist-msg-hook, mh-whitelist-msg-hook): New hooks.
 	(mh-folder-blacklisted, mh-folder-whitelisted): New faces.
-	* mh-folder.el (mh-folder-message-menu):  Add "Junk" to "Undo."
+	* mh-folder.el (mh-folder-message-menu): Add "Junk" to "Undo."
 	(mh-folder-font-lock-keywords): Add regexps for blacklisted and
 	whitelisted messages.
 	(mh-folder-mode): Add mh-blacklist and mh-whitelist variables.
@@ -149,8 +149,8 @@
 	X-MaxCode-Template:, X-ME-Bayesian:, X-Sendergroup:, X-SFDC-,
 	X-SMFBL:, X-SMHeaderMap:, X-VGI-OESCD:, X-VirtualServer:,
 	X-VirtualServerGroup:, X-XPT-XSL-Name:, X-Y-GMX-Trusted:,
-	X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-. Updated
-	the comment. (addresses SF #1916032).
+	X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-.  Updated
+	the comment.  (addresses SF #1916032).
 
 2012-11-25  Bill Wohler  <wohler@newt.com>
 
@@ -159,7 +159,7 @@
 	X-Bayes-Prob, X-Cam-, X-CanIt-Geo, X-Completed, X-Facebook,
 	X-Forwarded-, X-Generated-By, X-Headers-End, X-IEEE-UCE,
 	X-Jira-Fingerprint, X-Junkmail-, X-Launchpad-, X-MXL-Hash,
-	X-Notification-, X-Notifications, X-Oracle-Calendar. Replace
+	X-Notification-, X-Notifications, X-Oracle-Calendar.  Replace
 	X-DCC-Usenix-Metrics with X-DCC- (addresses SF #1916032).
 
 2012-11-25  Jeffrey C Honig  <jch@honig.net>

=== modified file 'lisp/org/ChangeLog'
--- lisp/org/ChangeLog	2013-04-18 00:12:33 +0000
+++ lisp/org/ChangeLog	2013-06-19 20:10:57 +0000
@@ -986,7 +986,7 @@
 2012-09-30  Achim Gratz  <Stromeko@Stromeko.DE>
 
 	* ob-R.el (org-babel-R-initiate-session): Protect against use of
-	unbound variable `ess-ask-for-ess-directory´. The default for this
+	unbound variable `ess-ask-for-ess-directory´.  The default for this
 	variable is true, so act accordingly if it is found unbound.
 
 	* ob-R.el: Remove initialization with `nil´ from
@@ -1031,7 +1031,7 @@
 	* org-version.el: New file.
 
 	* org-compat.el (org-check-version): New macro.  Check if
-	org-version.el exists and provide autoloads to that. Otherwise
+	org-version.el exists and provide autoloads to that.  Otherwise
 	check if org-fixup.el exists and use it to provide definitions.
 	Finally if nothing worked, complain about a botched installation
 	and provide fallback definitions.
@@ -3482,7 +3482,7 @@
 	org-footnote-unique-label if org-footnote-auto-label is set to
 	random.
 
-	* org-gnus.el: (org-gnus-follow-link): Fix argument to
+	* org-gnus.el (org-gnus-follow-link): Fix argument to
 	gnus-group-read-group so that following a link does not result in
 	unread article being selected.
 
@@ -3572,7 +3572,7 @@
 	* org-clock.el (org-clock-idle-time): Org-mode assumed that
 	x11idle was an available command, and returned an idle time of 0
 	if it was not
-	(never idle). Added checks so that org-idle-time will come from
+	(never idle): Added checks so that org-idle-time will come from
 	emacs' own current-idle-time if x11idle cannot be found or if it
 	cannot retrieve the idle time from X11
 
@@ -3628,7 +3628,7 @@
 	(org-comment-or-uncomment-region): Rewrite function.  Now comment
 	region at a fixed column: the minimal indentation of the region.
 	(org-fill-context-prefix): Rename function into
-	`org-adaptive-fill-function'. Also, In a paragraph, choose the
+	`org-adaptive-fill-function'.  Also, In a paragraph, choose the
 	same prefix as the current line.
 
 	* org-exp.el (org-export-handle-comments): Also remove comments at
@@ -3761,7 +3761,7 @@
 	point on an inlinetask.  Refactor code.
 
 	* org.el (org-mark-subtree): Do not make a special case for
-	inlinetasks when marking a subtree. These are handled by
+	inlinetasks when marking a subtree.  These are handled by
 	`org-element-mark-element'.
 
 	* org-element.el (org-element-comment-parser): Consider first "+"
@@ -4881,7 +4881,7 @@
 
 	* org-clock.el (org-in-clocktable-p): Move to org.el.
 
-	* org.el (org-in-clocktable-p): New function. Moved from
+	* org.el (org-in-clocktable-p): New function.  Moved from
 	org-clock.el.
 
 2012-04-01  David Maus  <dmaus@ictsoc.de>

=== modified file 'lwlib/ChangeLog'
--- lwlib/ChangeLog	2013-03-11 16:31:55 +0000
+++ lwlib/ChangeLog	2013-06-19 20:10:57 +0000
@@ -248,7 +248,7 @@
 	(xaw_update_one_widget): Reformat and remove dead code.
 	(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
 	(xaw_update_scrollbar): Remove (not used).
-	(make_dialog): Change from K&R to prototype. Remove dead code.
+	(make_dialog): Change from K&R to prototype.  Remove dead code.
 	(xaw_creation_table): Remove scrollbar entry.
 
 2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
@@ -357,7 +357,7 @@
 	(display_menu_item): Replace ws->window with ws->pixmap, remove
 	call to XftDrawRect.
 	(display_menu): Remove this and that argument.
-	Remove just_compute_this_one_p. Fill pixmap at start and copy it to
+	Remove just_compute_this_one_p.  Fill pixmap at start and copy it to
 	window at end.
 	(expose_cb): New function.
 	(make_windows_if_needed): Replace XCreateWindow with XtCreatePopup.
@@ -422,7 +422,7 @@
 	(make_windows_if_needed): Set max_rest_width and xft_draw
 	in windows[i].
 	(openXftFont): New.
-	(XlwMenuInitialize): Call openXftFont if HAVE_XFT. If mw->menu.font
+	(XlwMenuInitialize): Call openXftFont if HAVE_XFT.  If mw->menu.font
 	is not set, load font fixed and save it in xlwmenu_default_font.
 	(XlwMenuInitialize): Set max_rest_width and xft_draw in windows[0].
 	(XlwMenuClassInitialize): Initialize xlwmenu_default_font.
@@ -430,7 +430,7 @@
 	windows[0].xft_draw if xft_font is set.
 	(XlwMenuDestroy): Destroy all xft_draw and close xft_font.
 	(facename_changed): New.
-	(XlwMenuSetValues): Call facename_changed. If face name did change,
+	(XlwMenuSetValues): Call facename_changed.  If face name did change,
 	close old fonts and destroy xft_draw:s.  Then create new ones.
 
 	* xlwmenu.h (XtNfaceName, XtCFaceName, XtNdefaultFace,

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2013-06-19 14:20:26 +0000
+++ src/ChangeLog	2013-06-19 20:10:57 +0000
@@ -612,7 +612,7 @@
 	(update_frame_tool_bar): Update code for GNUStep.
 	(clearAll): New method.
 	(addDisplayItemWithImage:idx:tag:helpText:enabled:): Handle new tag
-	argument. Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP.
+	argument.  Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP.
 	Move identifierToItem setObject and activeIdentifiers addObject before
 	call to insertItemWithItemIdentifier.
 	(validateVisibleItems): Fix indentation.

=== modified file 'test/ChangeLog'
--- test/ChangeLog	2013-06-12 14:43:46 +0000
+++ test/ChangeLog	2013-06-19 20:10:57 +0000
@@ -1,7 +1,6 @@
 2013-06-12  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-	* automated/reftex-tests.el (reftex-parse-from-file-test): Fix
-	test.
+	* automated/reftex-tests.el (reftex-parse-from-file-test): Fix test.
 
 2013-06-12  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
------------------------------------------------------------
revno: 113085
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 12:59:23 -0400
message:
  ChangeLog bug ref fix
diff:
=== modified file 'lisp/ChangeLog.16'
--- lisp/ChangeLog.16	2013-06-18 11:17:50 +0000
+++ lisp/ChangeLog.16	2013-06-19 16:59:23 +0000
@@ -2653,7 +2653,7 @@
 
 	* help-macro.el (make-help-screen): Instead of switch-to-buffer
 	use pop-to-buffer with NORECORD argument t.  As buffer name, use
-	*Metahelp* with a leading space (Bug#13190).
+	*Metahelp* with a leading space (Bug#13146).
 
 2012-12-16  Romain Francoise  <romain@orebokech.com>
------------------------------------------------------------
revno: 113084
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Wed 2013-06-19 16:27:21 +0200
message:
  .bzrignore: Add GNU GLOBAL files.
diff:
=== modified file '.bzrignore'
--- .bzrignore	2013-06-02 03:56:40 +0000
+++ .bzrignore	2013-06-19 14:27:21 +0000
@@ -30,6 +30,9 @@
 core
 DOC
 emacs-*/
+GPATH
+GRTAGS
+GTAGS
 makefile
 Makefile
 Makefile.c

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-17 06:03:19 +0000
+++ ChangeLog	2013-06-19 14:27:21 +0000
@@ -1,3 +1,7 @@
+2013-06-19  Juanma Barranquero  <lekktu@gmail.com>
+
+	* .bzrignore: Add GNU GLOBAL files.
+
 2013-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use functions, not macros, for XINT etc. (Bug#11935).
------------------------------------------------------------
revno: 113083
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Wed 2013-06-19 16:20:26 +0200
message:
  src/sound.c: Silence some warnings.
  (string_default): Move to !WINDOWSNT section.
  (Fplay_sound_internal) [WINDOWSNT]: Remove i_result to avoid warning.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2013-06-19 07:36:20 +0000
+++ src/ChangeLog	2013-06-19 14:20:26 +0000
@@ -1,3 +1,8 @@
+2013-06-19  Juanma Barranquero  <lekktu@gmail.com>
+
+	* sound.c (string_default): Move to !WINDOWSNT section.
+	(Fplay_sound_internal) [WINDOWSNT]: Remove i_result to avoid warning.
+
 2013-06-19  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* sound.c: Integer cleanups.

=== modified file 'src/sound.c'
--- src/sound.c	2013-06-19 07:36:20 +0000
+++ src/sound.c	2013-06-19 14:20:26 +0000
@@ -325,15 +325,6 @@
 }
 
 
-/* Return S's value as a string if S is a string, otherwise DEFAULT_VALUE.  */
-
-static char const *
-string_default (Lisp_Object s, char const *default_value)
-{
-  return STRINGP (s) ? SSDATA (s) : default_value;
-}
-
-
 /* Parse sound specification SOUND, and fill ATTRS with what is
    found.  Value is non-zero if SOUND Is a valid sound specification.
    A valid sound specification is a list starting with the symbol
@@ -426,6 +417,15 @@
 /* BEGIN: Non Windows functions */
 #ifndef WINDOWSNT
 
+/* Return S's value as a string if S is a string, otherwise DEFAULT_VALUE.  */
+
+static char const *
+string_default (Lisp_Object s, char const *default_value)
+{
+  return STRINGP (s) ? SSDATA (s) : default_value;
+}
+
+
 /* Find out the type of the sound file whose file descriptor is FD.
    S is the sound file structure to fill in.  */
 
@@ -1335,7 +1335,6 @@
   char * psz_file = NULL;
   unsigned long ui_volume_tmp = UINT_MAX;
   unsigned long ui_volume = UINT_MAX;
-  int i_result = 0;
 #endif /* WINDOWSNT */
 
   /* Parse the sound specification.  Give up if it is invalid.  */
@@ -1430,7 +1429,7 @@
     {
       ui_volume = ui_volume_tmp * (UINT_MAX / 100);
     }
-  i_result = do_play_sound (psz_file, ui_volume);
+  do_play_sound (psz_file, ui_volume);
 
 #endif /* WINDOWSNT */
------------------------------------------------------------
revno: 113082
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Wed 2013-06-19 09:51:47 -0400
message:
  * doc/lispref/keymaps.texi (Active Keymaps): Fix documentation of
  set-temporary-overlay-map and overriding-terminal-local-map.
  * doc/lispref/modes.texi (Mode Line Data, Properties in Mode): Advertise
  `keymap' rather than `local-map'.
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2013-06-19 03:49:26 +0000
+++ doc/lispref/ChangeLog	2013-06-19 13:51:47 +0000
@@ -1,3 +1,11 @@
+2013-06-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* modes.texi (Mode Line Data, Properties in Mode): Advertise `keymap'
+	rather than `local-map'.
+
+	* keymaps.texi (Active Keymaps): Fix documentation of
+	set-temporary-overlay-map and overriding-terminal-local-map.
+
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (dist): Edit more configure variables.

=== modified file 'doc/lispref/display.texi'
--- doc/lispref/display.texi	2013-06-17 15:04:50 +0000
+++ doc/lispref/display.texi	2013-06-19 13:51:47 +0000
@@ -1655,26 +1655,26 @@
 an empty overlay a non-@code{nil} @code{evaporate} property, that deletes
 it immediately.
 
+@item keymap
+@cindex keymap of character (and overlays)
+@kindex keymap @r{(overlay property)}
+If this property is non-@code{nil}, it specifies a keymap for a portion of the
+text.  This keymap is used when the character after point is within the
+overlay, and takes precedence over most other keymaps.  @xref{Active Keymaps}.
+
 @item local-map
-@cindex keymap of character (and overlays)
 @kindex local-map @r{(overlay property)}
-If this property is non-@code{nil}, it specifies a keymap for a portion
-of the text.  The property's value replaces the buffer's local map, when
-the character after point is within the overlay.  @xref{Active Keymaps}.
-
-@item keymap
-@kindex keymap @r{(overlay property)}
-The @code{keymap} property is similar to @code{local-map} but overrides the
-buffer's local map (and the map specified by the @code{local-map}
-property) rather than replacing it.
+The @code{local-map} property is similar to @code{keymap} but replaces the
+buffer's local map rather than augmenting existing keymaps.  This also means it
+has lower precedence than minor mode keymaps.
 @end table
 
-The @code{local-map} and @code{keymap} properties do not affect a
+The @code{keymap} and @code{local-map} properties do not affect a
 string displayed by the @code{before-string}, @code{after-string}, or
 @code{display} properties.  This is only relevant for mouse clicks and
 other mouse events that fall on the string, since point is never on
 the string.  To bind special mouse events for the string, assign it a
-@code{local-map} or @code{keymap} text property.  @xref{Special
+@code{keymap} or @code{local-map} text property.  @xref{Special
 Properties}.
 
 @node Finding Overlays

=== modified file 'doc/lispref/keymaps.texi'
--- doc/lispref/keymaps.texi	2013-02-13 04:31:09 +0000
+++ doc/lispref/keymaps.texi	2013-06-19 13:51:47 +0000
@@ -663,17 +663,16 @@
 
   The highest precedence normal keymap comes from the @code{keymap}
 text or overlay property.  If that is non-@code{nil}, it is the first
-keymap to be processed, in normal circumstances.  Next comes
-any keymap added by the function @code{set-temporary-overlay-map}.
-@xref{Controlling Active Maps}.
+keymap to be processed, in normal circumstances.
 
   However, there are also special ways for programs to substitute
 other keymaps for some of those.  The variable
 @code{overriding-local-map}, if non-@code{nil}, specifies a keymap
 that replaces all the usual active keymaps except the global keymap.
-Another way to do this is with @code{overriding-terminal-local-map};
-it operates on a per-terminal basis.  These variables are documented
-below.
+
+The very highest precedence keymap comes from
+@code{overriding-terminal-local-map}; it operates on a per-terminal basis and
+is normally used for modal/transient keybindings.
 
 @cindex major mode keymap
   Since every buffer that uses the same major mode normally uses the

=== modified file 'doc/lispref/modes.texi'
--- doc/lispref/modes.texi	2013-02-15 06:35:54 +0000
+++ doc/lispref/modes.texi	2013-06-19 13:51:47 +0000
@@ -1800,7 +1800,7 @@
 characters which have no @code{face} properties are displayed, by
 default, in the face @code{mode-line} or @code{mode-line-inactive}
 (@pxref{Standard Faces,,, emacs, The GNU Emacs Manual}).  The
-@code{help-echo} and @code{local-map} properties in @var{string} have
+@code{help-echo} and @code{keymap} properties in @var{string} have
 special meanings.  @xref{Properties in Mode}.
 
 @item @var{symbol}
@@ -2205,7 +2205,7 @@
   Certain text properties are meaningful in the
 mode line.  The @code{face} property affects the appearance of text; the
 @code{help-echo} property associates help strings with the text, and
-@code{local-map} can make the text mouse-sensitive.
+@code{keymap} can make the text mouse-sensitive.
 
   There are four ways to specify text properties for text in the mode
 line:
@@ -2229,7 +2229,7 @@
 property.
 @end enumerate
 
-  You can use the @code{local-map} property to specify a keymap.  This
+  You can use the @code{keymap} property to specify a keymap.  This
 keymap only takes real effect for mouse clicks; binding character keys
 and function keys to it has no effect, since it is impossible to move
 point into the mode line.
------------------------------------------------------------
revno: 113081
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Wed 2013-06-19 15:21:15 +0200
message:
  * tramp.texi (Top, Configuration): Insert section `Predefined
  connection information' in menu.
  (Predefined connection information): New section.
  (Android shell setup): Make a reference to `Predefined connection
  information'.
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2013-06-19 07:01:22 +0000
+++ doc/misc/ChangeLog	2013-06-19 13:21:15 +0000
@@ -1,3 +1,11 @@
+2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (Top, Configuration): Insert section `Predefined
+	connection information' in menu.
+	(Predefined connection information): New section.
+	(Android shell setup): Make a reference to `Predefined connection
+	information'.
+
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (version): New, set by configure.

=== modified file 'doc/misc/tramp.texi'
--- doc/misc/tramp.texi	2013-04-16 08:11:56 +0000
+++ doc/misc/tramp.texi	2013-06-19 13:21:15 +0000
@@ -214,6 +214,8 @@
 * Customizing Completion::      Selecting config files for user/host name completion.
 * Password handling::           Reusing passwords for several connections.
 * Connection caching::          Reusing connection related information.
+* Predefined connection information::
+                                Setting own connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
 * Android shell setup::         Android shell setup hints.
@@ -542,6 +544,8 @@
 * Customizing Completion::      Selecting config files for user/host name completion.
 * Password handling::           Reusing passwords for several connections.
 * Connection caching::          Reusing connection related information.
+* Predefined connection information::
+                                Setting own connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
 * Android shell setup::         Android shell setup hints.
@@ -1727,6 +1731,35 @@
 connection again.
 
 
+@node Predefined connection information
+@section Setting own connection related information
+
+Sometimes, @var{tramp} is not able to detect correct connection
+related information.  In such cases, you could tell @var{tramp} which
+value it has to take.  Since this could result in errors, it has to be
+used with care.
+
+@vindex tramp-connection-properties
+Such settings can be performed via the list
+@code{tramp-connection-properties}.  An entry in this list has the
+form @code{(@var{regexp} @var{property} @var{value})}.  @var{regexp}
+matches remote file names for which a property shall be predefined.
+It can be @code{nil}.  @var{property} is a string, and @var{value} the
+corresponding value.  @var{property} could be any property found in
+the file @code{tramp-persistency-file-name}.
+
+A special property is @code{"busybox"}.  This must be set, if the
+remote host runs a very restricted busybox as shell, which closes the
+connection at will.  Since there is no reliable test for this,
+@var{tramp} must be indicated this way.  Example:
+
+@lisp
+(add-to-list 'tramp-connection-properties
+             (list (regexp-quote "@trampfn{ssh, user, randomhost.your.domain,}")
+                   "busybox" t))
+@end lisp
+
+
 @node Remote Programs
 @section How @value{tramp} finds and uses programs on the remote machine
 
@@ -1874,7 +1907,7 @@
 
 @var{tramp-password-prompt-regexp} handles the detection of such
 requests for English environments.  When you use another localization
-of your (local or remote) host, you might need to adapt this. Example:
+of your (local or remote) host, you might need to adapt this.  Example:
 
 @lisp
 (setq
@@ -2048,7 +2081,8 @@
 @end lisp
 
 @noindent
-with @samp{192.168.0.26} being the IP address of your Android device.
+with @samp{192.168.0.26} being the IP address of your Android device
+(@pxref{Predefined connection information}).
 
 The user settings for the @code{$PATH} environment variable must be
 preserved.  It has also been reported, that the commands in
------------------------------------------------------------
revno: 113080
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Wed 2013-06-19 15:14:24 +0200
message:
  * net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is
  not needed.
  
  * net/tramp-sh.el (tramp-find-shell): Don't set "busybox" property.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 07:37:45 +0000
+++ lisp/ChangeLog	2013-06-19 13:14:24 +0000
@@ -1,3 +1,10 @@
+2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is
+	not needed.
+
+	* net/tramp-sh.el (tramp-find-shell): Don't set "busybox" property.
+
 2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/browse-url.el (browse-url-browser-function):

=== modified file 'lisp/net/tramp-adb.el'
--- lisp/net/tramp-adb.el	2013-04-22 10:26:09 +0000
+++ lisp/net/tramp-adb.el	2013-06-19 13:14:24 +0000
@@ -375,16 +375,6 @@
 	"ls --color=never"
       "ls")))
 
-(defun tramp-adb-get-toolbox (vec)
-  "Get shell toolbox implementation: `toolbox' for original distributions
-or `busybox' for CyanogenMod based distributions"
-  (with-tramp-connection-property vec "toolbox"
-    (tramp-message vec 5 "Checking shell toolbox implementation")
-    (cond
-     ((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox)
-     ((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox)
-     (t 'unknown))))
-
 (defun tramp-adb--gnu-switches-to-ash
   (switches)
   "Almquist shell can't handle multiple arguments.

=== modified file 'lisp/net/tramp-sh.el'
--- lisp/net/tramp-sh.el	2013-04-22 10:26:09 +0000
+++ lisp/net/tramp-sh.el	2013-06-19 13:14:24 +0000
@@ -3626,13 +3626,7 @@
       (unless (string-equal shell default-shell)
 	(tramp-message
 	 vec 5 "Starting remote shell `%s' for tilde expansion" shell)
-	(tramp-open-shell vec shell))
-
-      ;; Busyboxes tend to behave strange.  We check for the existence.
-      (with-tramp-connection-property vec "busybox"
-	(tramp-send-command vec (format "%s --version" shell) t)
-	(let ((case-fold-search t))
-	  (and (string-match "busybox" (buffer-string)) t))))))
+	(tramp-open-shell vec shell)))))
 
 ;; Utility functions.
 
@@ -4458,6 +4452,9 @@
       ;; We mark the command string that it can be erased in the output buffer.
       (tramp-set-connection-property p "check-remote-echo" t)
       (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
+    ;; Some busyboxes tend to close the connection when we use the
+    ;; following syntax for here-documents.  This we cannot test; it
+    ;; shall be set via `tramp-connection-properties'.
     (when (and (string-match "<<'EOF'" command)
 	       (not (tramp-get-connection-property vec "busybox" nil)))
       ;; Unset $PS1 when using here documents, in order to avoid
------------------------------------------------------------
revno: 113079
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 06:17:40 -0400
message:
  Auto-commit of generated files.
diff:
=== modified file 'autogen/config.in'
--- autogen/config.in	2013-06-04 10:17:52 +0000
+++ autogen/config.in	2013-06-19 10:17:40 +0000
@@ -1677,15 +1677,7 @@
    configuration information. */
 #undef config_opsysfile
 
-/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
-   _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
-   _GL_INLINE_HEADER_BEGIN contains useful stuff to put
-     in an include file, before uses of _GL_INLINE.
-     It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
-   _GL_INLINE_HEADER_END contains useful stuff to put
-     in the same include file, after uses of _GL_INLINE.
+/* Please see the Gnulib manual for how to use these macros.
 
    Suppress extern inline with HP-UX cc, as it appears to be broken; see
    <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
@@ -1728,6 +1720,10 @@
 #  define _GL_INLINE_HEADER_CONST_PRAGMA \
      _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
 # endif
+  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
+     and "no previous declaration for 'FOO'"  diagnostics,
+     when FOO is an inline function in the header; see
+     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
 # define _GL_INLINE_HEADER_BEGIN \
     _Pragma ("GCC diagnostic push") \
     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
------------------------------------------------------------
revno: 113078
committer: Lars Magne Ingebrigtsen <larsi@gnus.org>
branch nick: trunk
timestamp: Wed 2013-06-19 09:37:45 +0200
message:
  Use `eww-browse-url' instead of `eww'
  
  * net/browse-url.el (browse-url-browser-function):
  `eww-browse-url' has the right calling signature, `eww' does not.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 07:35:00 +0000
+++ lisp/ChangeLog	2013-06-19 07:37:45 +0000
@@ -1,3 +1,8 @@
+2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/browse-url.el (browse-url-browser-function):
+	`eww-browse-url' has the right calling signature, `eww' does not.
+
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/bytecomp.el (byte-compile-file-form-autoload):

=== modified file 'lisp/net/browse-url.el'
--- lisp/net/browse-url.el	2013-06-17 23:59:09 +0000
+++ lisp/net/browse-url.el	2013-06-19 07:37:45 +0000
@@ -233,8 +233,8 @@
 	  (function-item :tag "Galeon" :value  browse-url-galeon)
 	  (function-item :tag "Epiphany" :value  browse-url-epiphany)
 	  (function-item :tag "Netscape" :value  browse-url-netscape)
+	  (function-item :tag "eww" :value  eww-browse-url)
 	  (function-item :tag "Mosaic" :value  browse-url-mosaic)
-	  (function-item :tag "eww" :value  eww)
 	  (function-item :tag "Mosaic using CCI" :value  browse-url-cci)
 	  (function-item :tag "Text browser in an xterm window"
 			 :value browse-url-text-xterm)
------------------------------------------------------------
revno: 113077
author: Paul Eggert  <eggert@cs.ucla.edu>
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Wed 2013-06-19 00:36:20 -0700
message:
  * sound.c: Integer cleanups.
  
  Remove unnecessary forward decls.
  (struct sound_device): The 'file' member is now a Lisp_Object, not
  a char *, so that we needn't invoke alloca on a huge size.
  (Fplay_sound_internal): Adjust to this.
  (string_default): New function.
  (vox_open, vox_init, alsa_open, alsa_configure, alsa_init):
  Use it to adjust to the struct sound_device change.
  (parse_sound, wav_init, au_init, alsa_init): Use bool for booleans.
  (be2hs) [0]: Remove.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2013-06-19 05:45:35 +0000
+++ src/ChangeLog	2013-06-19 07:36:20 +0000
@@ -1,5 +1,16 @@
 2013-06-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* sound.c: Integer cleanups.
+	Remove unnecessary forward decls.
+	(struct sound_device): The 'file' member is now a Lisp_Object, not
+	a char *, so that we needn't invoke alloca on a huge size.
+	(Fplay_sound_internal): Adjust to this.
+	(string_default): New function.
+	(vox_open, vox_init, alsa_open, alsa_configure, alsa_init):
+	Use it to adjust to the struct sound_device change.
+	(parse_sound, wav_init, au_init, alsa_init): Use bool for booleans.
+	(be2hs) [0]: Remove.
+
 	* syntax.c (skip_chars): Don't use uninitialized storage
 	when searching a multibyte buffer for characters that are not in a
 	unibyte string that contains non-ASCII characters.

=== modified file 'src/sound.c'
--- src/sound.c	2013-02-17 16:49:27 +0000
+++ src/sound.c	2013-06-19 07:36:20 +0000
@@ -181,8 +181,8 @@
 
 struct sound_device
 {
-  /* The name of the device or null meaning use a default device name.  */
-  char *file;
+  /* If a string, the name of the device; otherwise use a default.  */
+  Lisp_Object file;
 
   /* File descriptor of the device.  */
   int fd;
@@ -271,25 +271,12 @@
 
 /* Function prototypes.  */
 
-static void vox_open (struct sound_device *);
-static void vox_configure (struct sound_device *);
-static void vox_close (struct sound_device *sd);
-static void vox_choose_format (struct sound_device *, struct sound *);
-static int vox_init (struct sound_device *);
 static void vox_write (struct sound_device *, const char *, ptrdiff_t);
-static void find_sound_type (struct sound *);
-static u_int32_t le2hl (u_int32_t);
-static u_int16_t le2hs (u_int16_t);
-static u_int32_t be2hl (u_int32_t);
-static int wav_init (struct sound *);
+static bool wav_init (struct sound *);
 static void wav_play (struct sound *, struct sound_device *);
-static int au_init (struct sound *);
+static bool au_init (struct sound *);
 static void au_play (struct sound *, struct sound_device *);
 
-#if 0 /* Currently not used.  */
-static u_int16_t be2hs (u_int16_t);
-#endif
-
 /* END: Non Windows Definitions */
 #else /* WINDOWSNT */
 
@@ -338,6 +325,15 @@
 }
 
 
+/* Return S's value as a string if S is a string, otherwise DEFAULT_VALUE.  */
+
+static char const *
+string_default (Lisp_Object s, char const *default_value)
+{
+  return STRINGP (s) ? SSDATA (s) : default_value;
+}
+
+
 /* Parse sound specification SOUND, and fill ATTRS with what is
    found.  Value is non-zero if SOUND Is a valid sound specification.
    A valid sound specification is a list starting with the symbol
@@ -364,7 +360,7 @@
    VOL must be an integer in the range [0, 100], or a float in the
    range [0, 1].  */
 
-static int
+static bool
 parse_sound (Lisp_Object sound, Lisp_Object *attrs)
 {
   /* SOUND must be a list starting with the symbol `sound'.  */
@@ -527,9 +523,9 @@
    contains the first MAX_SOUND_HEADER_BYTES number of bytes from the
    sound file.  If the file is a WAV-format file, set up interface
    functions in S and convert header fields to host byte-order.
-   Value is non-zero if the file is a WAV file.  */
+   Value is true if the file is a WAV file.  */
 
-static int
+static bool
 wav_init (struct sound *s)
 {
   struct wav_header *header = (struct wav_header *) s->header;
@@ -635,9 +631,9 @@
    contains the first MAX_SOUND_HEADER_BYTES number of bytes from the
    sound file.  If the file is a AU-format file, set up interface
    functions in S and convert header fields to host byte-order.
-   Value is non-zero if the file is an AU file.  */
+   Value is true if the file is an AU file.  */
 
-static int
+static bool
 au_init (struct sound *s)
 {
   struct au_header *header = (struct au_header *) s->header;
@@ -706,20 +702,14 @@
    has a compatible own driver aka Luigi's driver.  */
 
 
-/* Open device SD.  If SD->file is non-null, open that device,
+/* Open device SD.  If SD->file is a string, open that device,
    otherwise use a default device name.  */
 
 static void
 vox_open (struct sound_device *sd)
 {
-  const char *file;
-
   /* Open the sound device (eg /dev/dsp).  */
-  if (sd->file)
-    file = sd->file;
-  else
-    file = DEFAULT_SOUND_DEVICE;
-
+  char const *file = string_default (sd->file, DEFAULT_SOUND_DEVICE);
   sd->fd = emacs_open (file, O_WRONLY, 0);
   if (sd->fd < 0)
     sound_perror (file);
@@ -862,18 +852,12 @@
 /* Initialize device SD.  Set up the interface functions in the device
    structure.  */
 
-static int
+static bool
 vox_init (struct sound_device *sd)
 {
-  const char *file;
-  int fd;
-
   /* Open the sound device (eg /dev/dsp).  */
-  if (sd->file)
-    file = sd->file;
-  else
-    file = DEFAULT_SOUND_DEVICE;
-  fd = emacs_open (file, O_WRONLY, 0);
+  char const *file = string_default (sd->file, DEFAULT_SOUND_DEVICE);
+  int fd = emacs_open (file, O_WRONLY, 0);
   if (fd >= 0)
     emacs_close (fd);
   else
@@ -924,23 +908,17 @@
   snd_pcm_uframes_t period_size;
 };
 
-/* Open device SD.  If SD->file is non-null, open that device,
+/* Open device SD.  If SD->file is a string, open that device,
    otherwise use a default device name.  */
 
 static void
 alsa_open (struct sound_device *sd)
 {
-  const char *file;
-  struct alsa_params *p;
+  /* Open the sound device.  Default is "default".  */
+  struct alsa_params *p = xmalloc (sizeof *p);
+  char const *file = string_default (sd->file, DEFAULT_ALSA_SOUND_DEVICE);
   int err;
 
-  /* Open the sound device.  Default is "default".  */
-  if (sd->file)
-    file = sd->file;
-  else
-    file = DEFAULT_ALSA_SOUND_DEVICE;
-
-  p = xmalloc (sizeof *p);
   p->handle = NULL;
   p->hwparams = NULL;
   p->swparams = NULL;
@@ -1052,10 +1030,10 @@
       int chn;
       snd_mixer_t *handle;
       snd_mixer_elem_t *e;
-      const char *file = sd->file ? sd->file : DEFAULT_ALSA_SOUND_DEVICE;
-
       if (snd_mixer_open (&handle, 0) >= 0)
         {
+	  char const *file = string_default (sd->file,
+					     DEFAULT_ALSA_SOUND_DEVICE);
           if (snd_mixer_attach (handle, file) >= 0
               && snd_mixer_load (handle) >= 0
               && snd_mixer_selem_register (handle, NULL, NULL) >= 0)
@@ -1212,19 +1190,14 @@
 /* Initialize device SD.  Set up the interface functions in the device
    structure.  */
 
-static int
+static bool
 alsa_init (struct sound_device *sd)
 {
-  const char *file;
+  /* Open the sound device.  Default is "default".  */
+  char const *file = string_default (sd->file, DEFAULT_ALSA_SOUND_DEVICE);
   snd_pcm_t *handle;
   int err;
 
-  /* Open the sound device.  Default is "default".  */
-  if (sd->file)
-    file = sd->file;
-  else
-    file = DEFAULT_ALSA_SOUND_DEVICE;
-
   snd_lib_error_set_handler ((snd_lib_error_handler_t) snd_error_quiet);
   err = snd_pcm_open (&handle, file, SND_PCM_STREAM_PLAYBACK, 0);
   snd_lib_error_set_handler (NULL);
@@ -1404,12 +1377,7 @@
   find_sound_type (current_sound);
 
   /* Set up a device.  */
-  if (STRINGP (attrs[SOUND_DEVICE]))
-    {
-      int len = SCHARS (attrs[SOUND_DEVICE]);
-      current_sound_device->file = alloca (len + 1);
-      strcpy (current_sound_device->file, SSDATA (attrs[SOUND_DEVICE]));
-    }
+  current_sound_device->file = attrs[SOUND_DEVICE];
 
   if (INTEGERP (attrs[SOUND_VOLUME]))
     current_sound_device->volume = XFASTINT (attrs[SOUND_VOLUME]);
------------------------------------------------------------
revno: 113076
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:35:00 -0700
message:
  Check autoload's "type" argument correctly in bytecomp.el
  
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-autoload):
  Only eval autoloaded macros.
  (byte-compile-autoload): Only give the macro warning for macros.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 07:24:44 +0000
+++ lisp/ChangeLog	2013-06-19 07:35:00 +0000
@@ -1,5 +1,9 @@
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
+	* emacs-lisp/bytecomp.el (byte-compile-file-form-autoload):
+	Only eval autoloaded macros.
+	(byte-compile-autoload): Only give the macro warning for macros.
+
 	* progmodes/cperl-mode.el (ps-bold-faces, ps-italic-faces)
 	(ps-underlined-faces): Declare.
 

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- lisp/emacs-lisp/bytecomp.el	2013-06-14 02:31:28 +0000
+++ lisp/emacs-lisp/bytecomp.el	2013-06-19 07:35:00 +0000
@@ -2215,7 +2215,7 @@
   (and (let ((form form))
 	 (while (if (setq form (cdr form)) (macroexp-const-p (car form))))
 	 (null form))			;Constants only
-       (eval (nth 5 form))		;Macro
+       (memq (eval (nth 5 form)) '(t macro)) ;Macro
        (eval form))			;Define the autoload.
   ;; Avoid undefined function warnings for the autoload.
   (when (and (consp (nth 1 form))
@@ -4187,7 +4187,7 @@
   (byte-compile-set-symbol-position 'autoload)
   (and (macroexp-const-p (nth 1 form))
        (macroexp-const-p (nth 5 form))
-       (eval (nth 5 form))  ; macro-p
+       (memq (eval (nth 5 form)) '(t macro))  ; macro-p
        (not (fboundp (eval (nth 1 form))))
        (byte-compile-warn
 	"The compiler ignores `autoload' except at top level.  You should
------------------------------------------------------------
revno: 113075
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:28:47 -0700
message:
  cedet/semantic/decorate/mode.el autoload tweak
  
  * cedet/semantic/decorate/mode.el (define-semantic-decoration-style): Doc fix.
  (define-semantic-decoration-style): 'function is not an accepted
  value for autoload's "type" argument.  Might as well use the default.
diff:
=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2013-06-18 02:06:33 +0000
+++ lisp/cedet/ChangeLog	2013-06-19 07:28:47 +0000
@@ -1,3 +1,10 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+	* semantic/decorate/mode.el (define-semantic-decoration-style):
+	Doc fix.
+	(define-semantic-decoration-style): 'function is not an accepted
+	value for autoload's "type" argument.  Might as well use the default.
+
 2013-06-18  Glenn Morris  <rgm@gnu.org>
 
 	* semantic/ctxt.el (semantic-ctxt-end-of-symbol-default):

=== modified file 'lisp/cedet/semantic/decorate/mode.el'
--- lisp/cedet/semantic/decorate/mode.el	2013-06-10 23:02:33 +0000
+++ lisp/cedet/semantic/decorate/mode.el	2013-06-19 07:28:47 +0000
@@ -374,7 +374,7 @@
   "Define a new decoration style with NAME.
 DOC is a documentation string describing the decoration style NAME.
 It is appended to auto-generated doc strings.
-An Optional list of FLAGS can also be specified.  Flags are:
+An optional list of FLAGS can also be specified.  Flags are:
   :enabled <value>  - specify the default enabled value for NAME.
   :load <value>     - specify a feature (as a string) with the rest of
                       the definition for decoration mode NAME.
@@ -428,11 +428,10 @@
        (when (stringp ,loadfile)
 	 (unless (fboundp ',predicatedef)
 	   (autoload ',predicatedef ',loadfile "Return non-nil to decorate TAG."
-	     nil 'function))
+	     ))
 
 	 (unless (fboundp ',highlighterdef)
-	   (autoload ',highlighterdef ',loadfile "Decorate TAG."
-	     nil 'function))
+	   (autoload ',highlighterdef ',loadfile "Decorate TAG."))
 	 ))
     ))
------------------------------------------------------------
revno: 113074
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:24:44 -0700
message:
  Quieten cperl-mode compilation
  
  * lisp/progmodes/cperl-mode.el (ps-bold-faces, ps-italic-faces)
  (ps-underlined-faces): Declare.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 07:21:59 +0000
+++ lisp/ChangeLog	2013-06-19 07:24:44 +0000
@@ -1,5 +1,8 @@
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
+	* progmodes/cperl-mode.el (ps-bold-faces, ps-italic-faces)
+	(ps-underlined-faces): Declare.
+
 	* progmodes/idlwave.el (func-menu): Only set it up on XEmacs.
 	(speedbar-add-supported-extension): Declare.
 

=== modified file 'lisp/progmodes/cperl-mode.el'
--- lisp/progmodes/cperl-mode.el	2013-05-29 02:46:35 +0000
+++ lisp/progmodes/cperl-mode.el	2013-06-19 07:24:44 +0000
@@ -6217,6 +6217,10 @@
     (error (message "cperl-init-faces (ignored): %s" errs))))
 
 
+(defvar ps-bold-faces)
+(defvar ps-italic-faces)
+(defvar ps-underlined-faces)
+
 (defun cperl-ps-print-init ()
   "Initialization of `ps-print' components for faces used in CPerl."
   (eval-after-load "ps-print"
------------------------------------------------------------
revno: 113073
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:23:06 -0700
message:
  * lisp/gnus/gnus-group.el (gnus-mark-article-as-read): Fix declaration.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2013-06-18 22:38:34 +0000
+++ lisp/gnus/ChangeLog	2013-06-19 07:23:06 +0000
@@ -1,3 +1,7 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+	* gnus-group.el (gnus-mark-article-as-read): Fix declaration.
+
 2013-06-18  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* auth-source.el (auth-source-netrc-parse-entries): Remove debugging.

=== modified file 'lisp/gnus/gnus-group.el'
--- lisp/gnus/gnus-group.el	2013-05-29 02:40:43 +0000
+++ lisp/gnus/gnus-group.el	2013-06-19 07:23:06 +0000
@@ -4661,7 +4661,7 @@
   (let ((gnus-group-list-option 'limit))
     (gnus-group-list-plus args)))
 
-(declare-function gnus-mark-article-as-read "gnu-sum" (article &optional mark))
+(declare-function gnus-mark-article-as-read "gnus-sum" (article &optional mark))
 (declare-function gnus-group-make-articles-read "gnus-sum" (group articles))
 
 (defun gnus-group-mark-article-read (group article)
------------------------------------------------------------
revno: 113072
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:21:59 -0700
message:
  Silence idlwave compilation
  
  * lisp/progmodes/idlwave.el (func-menu): Only set it up on XEmacs.
  (speedbar-add-supported-extension): Declare.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 07:19:42 +0000
+++ lisp/ChangeLog	2013-06-19 07:21:59 +0000
@@ -1,5 +1,8 @@
 2013-06-19  Glenn Morris  <rgm@gnu.org>
 
+	* progmodes/idlwave.el (func-menu): Only set it up on XEmacs.
+	(speedbar-add-supported-extension): Declare.
+
 	* international/titdic-cnv.el (tit-process-header, miscdic-convert):
 	Don't include a date stamp in the header of the generated file;
 	it leads to needless differences between output files.

=== modified file 'lisp/progmodes/idlwave.el'
--- lisp/progmodes/idlwave.el	2013-05-29 07:18:09 +0000
+++ lisp/progmodes/idlwave.el	2013-06-19 07:21:59 +0000
@@ -9041,7 +9041,7 @@
 ;; Here we hack func-menu.el in order to support this new mode.
 ;; The latest versions of func-menu.el already have this stuff in, so
 ;; we hack only if it is not already there.
-(when (fboundp 'eval-after-load)
+(when (featurep 'xemacs)
   (eval-after-load "func-menu"
     '(progn
        (or (assq 'idlwave-mode fume-function-name-regexp-alist)
@@ -9295,6 +9295,8 @@
   (with-current-buffer "*Help*"
     (setq truncate-lines t)))
 
+(declare-function speedbar-add-supported-extension "speedbar" (extension))
+
 ;; Add .pro files to speedbar for support, if it's loaded
 (eval-after-load "speedbar" '(speedbar-add-supported-extension ".pro"))
------------------------------------------------------------
revno: 113071
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:19:42 -0700
message:
  * international/titdic-cnv.el (tit-process-header, miscdic-convert):
  Don't include a date stamp in the header of the generated file;
  it leads to needless differences between output files.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-06-19 06:24:12 +0000
+++ lisp/ChangeLog	2013-06-19 07:19:42 +0000
@@ -1,3 +1,9 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+	* international/titdic-cnv.el (tit-process-header, miscdic-convert):
+	Don't include a date stamp in the header of the generated file;
+	it leads to needless differences between output files.
+
 2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/secrets.el (secrets-struct-secret-content-type): Replace

=== modified file 'lisp/international/titdic-cnv.el'
--- lisp/international/titdic-cnv.el	2013-01-01 09:11:05 +0000
+++ lisp/international/titdic-cnv.el	2013-06-19 07:19:42 +0000
@@ -273,9 +273,8 @@
     (princ ";; Quail package `")
     (princ package)
     (princ (format "' -*- coding:%s -*-\n" coding-system-for-write))
-    (princ ";;   Generated by the command `titdic-convert'\n;;\tDate: ")
-    (princ (current-time-string))
-    (princ "\n;;\tOriginal TIT dictionary file: ")
+    (princ ";;   Generated by the command `titdic-convert'\n")
+    (princ ";;\tOriginal TIT dictionary file: ")
     (princ (file-name-nondirectory filename))
     (princ "\n\n;;; Comment:\n\n")
     (princ ";; Byte-compile this file again after any modification.\n\n")
@@ -1152,7 +1151,6 @@
 	  (insert (format ";; Quail package `%s' -*- coding:%s -*-\n"
                           name coding))
 	  (insert ";;   Generated by the command `miscdic-convert'\n")
-	  (insert ";;   Date: " (current-time-string) "\n")
 	  (insert ";;   Source dictionary file: " dicfile "\n")
 	  (insert ";;   Copyright notice of the source file\n")
 	  (insert ";;------------------------------------------------------\n")
------------------------------------------------------------
revno: 113070
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-06-19 00:01:22 -0700
message:
  Add make dist rule for doc/misc/Makefile, for www.gnu.org
  
  * doc/misc/Makefile.in (version): New, set by configure.
  (clean): Delete dist tar file.
  (infoclean): New, split from maintainer-clean.
  (maintainer-clean): Run infoclean.
  (dist): New rule, to make tarfile for www.gnu.org.
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2013-06-14 09:48:49 +0000
+++ doc/misc/ChangeLog	2013-06-19 07:01:22 +0000
@@ -1,3 +1,11 @@
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (version): New, set by configure.
+	(clean): Delete dist tar file.
+	(infoclean): New, split from maintainer-clean.
+	(maintainer-clean): Run infoclean.
+	(dist): New rule, to make tarfile for www.gnu.org.
+
 2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
 
 	* sieve.texi: (Managing Sieve): Fix port in example, fix documentation

=== modified file 'doc/misc/Makefile.in'
--- doc/misc/Makefile.in	2013-02-21 22:42:56 +0000
+++ doc/misc/Makefile.in	2013-06-19 07:01:22 +0000
@@ -24,6 +24,8 @@
 # set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
 
+version=@version@
+
 ## Where the output files go.
 buildinfodir = $(srcdir)/../../info
 ## Directory with emacsver.texi.
@@ -719,15 +721,38 @@
 
 clean: mostlyclean
 	rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS) emacs-faq.text
+	rm -f emacs-misc-${version}.tar*
 
 distclean: clean
 #	rm -f Makefile
 
 ## buildinfodir is relative to srcdir.
-maintainer-clean: distclean
+infoclean:
 	cd $(buildinfodir); for file in $(INFO_TARGETS); do \
 	  file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \
 	  rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \
 	done
 
+maintainer-clean: distclean infoclean
+
+dist:
+	rm -rf emacs-misc-${version}
+	mkdir emacs-misc-${version}
+	cp ${srcdir}/*.texi ${srcdir}/texinfo.tex \
+	  $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
+	  emacs-misc-${version}/
+	sed -e 's/@sr[c]dir@/./' \
+	  -e 's/^\(emacsdir *=\).*/\1 ./' \
+	  -e 's/^\(buildinfodir *=\).*/\1 ./' \
+	  -e 's/^\(clean:.*\)/\1 infoclean/' \
+	  -e "s/@ver[s]ion@/${version}/" \
+	  -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+	  -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
+	  ${srcdir}/Makefile.in > emacs-misc-${version}/Makefile
+	@if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \
+	  echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+	fi
+	tar -cf emacs-misc-${version}.tar emacs-misc-${version}
+	rm -rf emacs-misc-${version}
+
 ### Makefile ends here
------------------------------------------------------------
revno: 113069
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-06-18 23:41:37 -0700
message:
  Tweak regexp in previous doc/*/Makefile.in change, make error fatal
diff:
=== modified file 'doc/emacs/Makefile.in'
--- doc/emacs/Makefile.in	2013-06-19 03:49:26 +0000
+++ doc/emacs/Makefile.in	2013-06-19 06:41:37 +0000
@@ -201,9 +201,10 @@
 	  -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
 	  -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
 	  ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
+	@if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
+	  echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+	fi
 	tar -cf emacs-manual-${version}.tar emacs-manual-${version}
-	@grep '@[A-Z]*@' emacs-manual-${version}/Makefile && \
-	  echo "WARNING: Unexpanded configure variables in Makefile?" || true
 	rm -rf emacs-manual-${version}
 
 ### Makefile ends here

=== modified file 'doc/lispintro/Makefile.in'
--- doc/lispintro/Makefile.in	2013-06-19 03:49:26 +0000
+++ doc/lispintro/Makefile.in	2013-06-19 06:41:37 +0000
@@ -112,9 +112,10 @@
 	  -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
 	  -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
 	  ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
+	@if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
+	  echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+	fi
 	tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
-	@grep '@[A-Z]*@' emacs-lispintro-${version}/Makefile && \
-	  echo "WARNING: Unexpanded configure variables in Makefile?" || true
 	rm -rf emacs-lispintro-${version}
 
 ### Makefile ends here

=== modified file 'doc/lispref/Makefile.in'
--- doc/lispref/Makefile.in	2013-06-19 03:49:26 +0000
+++ doc/lispref/Makefile.in	2013-06-19 06:41:37 +0000
@@ -169,9 +169,10 @@
 	  -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
 	  -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
 	  ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
+	@if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
+	  echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+	fi
 	tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
-	@grep '@[A-Z]*@' emacs-lispref-${version}/Makefile && \
-	  echo "WARNING: Unexpanded configure variables in Makefile?" || true
 	rm -rf emacs-lispref-${version}
 
 ### Makefile ends here