Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-474
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-475
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-476
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-477
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-478
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-150
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-151
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-152
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-584

26 files changed, 281 insertions, 105 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dd343fc8ee..89a00314048 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,97 @@
+2006-10-18  Juanma Barranquero  <lekktu@gmail.com>
+
+	* progmodes/ada-mode.el (ada-83-string-keywords)
+	(ada-last-which-function-line ada-no-auto-case, ada-indent-region)
+	(ada-which-compiler, ada-align-modes, ada-adjust-case-buffer)
+	(ada-looking-at-semi-private, ada-get-body-name):
+	Fix typos in docstrings.
+	(ada-create-case-exception, ada-create-case-exception-substring):
+	Fix typos in error messages.
+	(ada-goto-matching-end, ada-narrow-to-defun): Doc fixes.
+
+2006-10-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* term/x-win.el (res-geometry): Don't set geometry from Xresources
+	to default-frame-alist if default-frame-alist already contains
+	width/height.
+
+2006-10-18  Richard Stallman  <rms@gnu.org>
+
+	* emacs-lisp/pp.el (pp-eval-expression): Use `X' to read value.
+	Non-interactive arg is the value, not the expression.
+
+	* simple.el (read-expression-map): Just set it, no defvar.
+
+	* subr.el (insert-for-yank-1): If last inserted char has
+	properties, mark them as rear-nonsticky.
+
+	* recentf.el (recentf-mode): Doc fix.
+
+	* facemenu.el (facemenu-add-new-face): Defend against symbol
+	that isn't a face name.
+
+	* dired-aux.el (dired-do-copy): Doc fix.
+
+2006-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (line-move-1): Ignore fields when moving to the
+	beginning of line to avoid getting point stuck.
+
+2006-10-18  Martin Rudalics  <rudalics@gmx.at>
+
+	* textmodes/flyspell.el (flyspell-word-search-backward): Set
+	inhibit-point-motion-hooks to avoid looping due to intangibile
+	text.
+
+2006-10-16  Richard Stallman  <rms@gnu.org>
+
+	* help-fns.el (describe-function-1): Special case optimization
+	for self-insert-command.
+
+2006-10-16  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-reread-directory): Work in `dir' mode too.
+
+2006-10-15  Martin Rudalics  <rudalics@gmx.at>
+
+	* textmodes/table.el: Require 'regexp-opt.
+
+2006-10-15  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+	* progmodes/flymake.el (flymake-get-project-include-dirs-imp):
+	Use shell-quote-argument.
+
+	* shell.el (explicit-bash-args): Likewise.
+
+	* progmodes/ada-xref.el (ada-find-in-src-path): Likewise.
+	Use grep -E rather than egrep.
+
+2006-10-15  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+	* ido.el (ido-exhibit): Allow `-', `_', and trailing `$' in user id.
+
+2006-10-15  Kim F. Storm  <storm@cua.dk>
+
+	* filesets.el (filesets-run-cmd--repl-fn): Use shell-quote-argument.
+
+2006-10-14  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+	* filesets.el (filesets-cmd-shell-command): Quote buffer-file-name
+	to protect whitespace and metacharacters from the shell.
+
 2006-10-13  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
 
-	* apropos.el (apropos-pattern-quoted): Fix a typo in a doc
-	string.
+	* apropos.el (apropos-pattern-quoted): Fix a typo in a doc string.
 
 2006-10-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* subr.el (start-process-shell-command): Doc fix.
 
+2006-10-13  Andrea Russo  <rastandy@salug.it>  (tiny change)
+
+	* info-look.el <maxima-mode, inferior-maxima-mode>: Allow [0-9] in
+	the regexp for Maxima symbols.
+
 2006-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-hooks.el (vc-ignore-dir-regexp): Make it into a defcustom.
@@ -19,8 +104,13 @@
 
 2006-10-12  Carsten Dominik  <dominik@science.uva.nl>
 
-	* textmodes/reftex-global.el (reftex-create-tags-file): Quote file
-	arguments.
+	* textmodes/reftex-global.el (reftex-create-tags-file):
+	Quote file arguments.
+
+2006-10-12  Richard Stallman  <rms@gnu.org>
+
+	* files.el (file-name-history): Add defvar.
+	(save-some-buffers-action-alist): Improve description strings.
 
 2006-10-12  Andreas Schwab  <schwab@suse.de>
 
@@ -380,7 +470,7 @@
 		was inverted;
 		Support `comment-column' = 0.
 
-2006-10-11  Martin Rudalics <rudalics@gmx.at>
+2006-10-11  Martin Rudalics  <rudalics@gmx.at>
 
 	* dnd.el (dnd-handle-one-url): Fix typo in doc-string.
 	* help-at-pt.el (scan-buf-move-to-region): Likewise.
@@ -424,8 +514,8 @@
 
 2006-10-08  Nick Roberts  <nickrob@snap.net.nz>
 
-	* progmodes/gdb-ui.el (gdb-speedbar-expand-node): Burp if
-	GUD buffer has been killed.
+	* progmodes/gdb-ui.el (gdb-speedbar-expand-node):
+	Burp if GUD buffer has been killed.
 
 2006-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 6082fc180dc..769d98c9530 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1560,7 +1560,10 @@ When operating on multiple or marked files, you specify a directory,
 and new copies of these files are made in that directory
 with the same names that the files currently have.  The default
 suggested for the target directory depends on the value of
-`dired-dwim-target', which see."
+`dired-dwim-target', which see.
+
+This command copies symbolic links by creating new ones,
+like `cp -d'."
   (interactive "P")
   (let ((dired-recursive-copies dired-recursive-copies))
     (dired-do-create-files 'copy (function dired-copy-file)
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index f30b69ddac0..a9cb2abd741 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -97,13 +97,16 @@ Output stream is STREAM, or value of `standard-output' (which see)."
   (princ (pp-to-string object) (or stream standard-output)))
 
 ;;;###autoload
-(defun pp-eval-expression (expression)
-  "Evaluate EXPRESSION and pretty-print value into a new display buffer.
-If the pretty-printed value fits on one line, the message line is used
-instead.  The value is also consed onto the front of the list
-in the variable `values'."
-  (interactive "xPp-eval: ")
-  (setq values (cons (eval expression) values))
+(defun pp-eval-expression (expval)
+  "Evaluate an expression, then pretty-print value EXPVAL into a new buffer.
+If pretty-printed EXPVAL fits on one line, display it in the echo
+area instead.  Also add EXPVAL to the front of the list
+in the variable `values'.
+
+Non-interactively, the argument is the value, EXPVAL, not the expression
+to evaluate."
+  (interactive "XPp-eval: ")
+  (setq values (cons expval values))
   (let* ((old-show-function temp-buffer-show-function)
 	 ;; Use this function to display the buffer.
 	 ;; This function either decides not to display it at all
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index eaaf4dacd72..13cf7fbd734 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -690,6 +690,9 @@ This is called whenever you create a new face, and at other times."
     (cond ((facemenu-iterate ; check if equivalent face is already in the menu
 	    (lambda (m) (and (listp m)
 			     (symbolp (car m))
+			     ;; Avoid error in face-equal
+			     ;; when a non-face is erroneously present.
+			     (facep (car m))
 			     (face-equal (car m) symbol)))
 	    (cdr (symbol-function menu))))
 	  ;; Faces with a keyboard equivalent.  These go at the front.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index eb8cdb02617..355c39f8ed7 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1603,7 +1603,7 @@ Replace <file-name> or <<file-name>> with filename."
 		      ((equal arg "<file-name>")
 		       (buffer-file-name))
 		      ((equal arg "<<file-name>>")
-		       (filesets-quote (buffer-file-name)))
+		       (shell-quote-argument (buffer-file-name)))
 		      (t
 		       arg))))
 
@@ -1701,7 +1701,7 @@ Replace <file-name> or <<file-name>> with filename."
 		  ok)
 	      t)))
     (when ok
-      (let ((cmd (format txt (buffer-file-name))))
+      (let ((cmd (format txt (shell-quote-argument (buffer-file-name)))))
 	(message "Filesets: %s" cmd)
 	(filesets-cmd-show-result cmd
 				  (shell-command-to-string cmd))))))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 63e7f43424d..dba2c407b21 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+	* mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
+	"blank line" when searching for end of armor headers.
+
+2006-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gmm-utils.el (gmm-write-region): Fix variable name.
+
+2006-10-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gmm-utils.el (gmm-write-region): New function based on compatibility
+	code from `mm-make-temp-file'.
+
+	* mm-util.el (mm-make-temp-file): Use `gmm-write-region'.
+
+	* nnmaildir.el (nnmaildir--update-nov)
+	(nnmaildir-request-replace-article, nnmaildir-request-accept-article):
+	Use `gmm-write-region'.
+
 2006-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-sum.el (gnus-summary-make-menu-bar): Clarify
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index e773aa3bfac..59d02927008 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -401,6 +401,21 @@ If mode is nil, use `major-mode' of the curent buffer."
 		 (string-match "^\\(.+\\)-mode$" mode)
 		 (match-string 1 mode))))))
 
+(defun gmm-write-region (start end filename &optional append visit
+			       lockname mustbenew)
+  "Compatibility function for `write-region'.
+
+In XEmacs, the seventh argument of `write-region' specifies the
+coding-system."
+  (if (and mustbenew
+	   (or (featurep 'xemacs)
+	       (= emacs-major-version 20)))
+      (if (file-exists-p filename)
+	  (signal 'file-already-exists
+		  (list "File exists" filename))
+	(write-region start end filename append visit lockname))
+    (write-region start end filename append visit lockname mustbenew)))
+
 (provide 'gmm-utils)
 
 ;; arch-tag: e0b60920-2ce6-40c1-bfc0-cadbbe26b602
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 1c9f9749f85..e75f2ef6d5f 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1126,17 +1126,11 @@ If SUFFIX is non-nil, add that at the end of the file name."
 			     (setq file (concat file suffix)))
 			 (if dir-flag
 			     (make-directory file)
-			   (if (or (featurep 'xemacs)
-				   (= emacs-major-version 20))
-			       ;; NOTE: This is unsafe if Emacs 20
-			       ;; users and XEmacs users don't use
-			       ;; a secure temp directory.
-			       (if (file-exists-p file)
-				   (signal 'file-already-exists
-					   (list "File exists" file))
-				 (write-region "" nil file nil 'silent))
-			     (write-region "" nil file nil 'silent
-					   nil 'excl)))
+			   ;; NOTE: This is unsafe if Emacs 20
+			   ;; users and XEmacs users don't use
+			   ;; a secure temp directory.
+			   (gmm-write-region "" nil file nil 'silent
+					     nil 'excl))
 			 nil)
 		     (file-already-exists t)
 		     ;; The Emacs 20 and XEmacs versions of
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 9d9d87a3670..b1ed0b7af4e 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -373,7 +373,7 @@ Return that buffer."
 	   mm-security-handle 'gnus-details
 	   (format "Clear verification not supported by `%s'.\n" mml2015-use))))
       (goto-char (point-min))
-      (if (search-forward "\n\n" nil t)
+      (if (re-search-forward "\n[\t ]*\n" nil t)
 	  (delete-region (point-min) (point)))
       (if (re-search-forward mm-uu-pgp-beginning-signature nil t)
 	  (delete-region (match-beginning 0) (point-max)))
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 6024b992061..589c4da8caf 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -428,7 +428,8 @@ by nnmaildir-request-article.")
 	(prin1 (vector storage-version num msgid nov) (current-buffer))
 	(setq file (concat novfile ":"))
 	(nnmaildir--unlink file)
-	(write-region (point-min) (point-max) file nil 'no-message nil 'excl))
+	(gmm-write-region (point-min) (point-max) file nil 'no-message nil
+			  'excl))
       (rename-file file novfile 'replace)
       (setf (nnmaildir--art-msgid article) msgid)
       nov)))
@@ -1246,8 +1247,8 @@ by nnmaildir-request-article.")
 	(throw 'return nil))
       (save-excursion
 	(set-buffer buffer)
-	(write-region (point-min) (point-max) tmpfile nil 'no-message nil
-		      'excl))
+	(gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
+			  'excl))
       (unix-sync) ;; no fsync :(
       (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
       t)))
@@ -1341,8 +1342,8 @@ by nnmaildir-request-article.")
       (condition-case nil
 	  (add-name-to-file nnmaildir--file tmpfile)
 	(error
-	 (write-region (point-min) (point-max) tmpfile nil 'no-message nil
-		       'excl)
+	 (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
+			   'excl)
 	 (unix-sync))) ;; no fsync :(
       (nnheader-cancel-timer 24h)
       (condition-case err
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index d4146b19d60..baffa004224 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -383,35 +383,40 @@ face (according to `face-differs-from-default-p')."
     (princ ".")
     (terpri)
     (when (commandp function)
-      (let* ((remapped (command-remapping function))
-	     (keys (where-is-internal
-		    (or remapped function) overriding-local-map nil nil))
-	     non-modified-keys)
-	;; Which non-control non-meta keys run this command?
-	(dolist (key keys)
-	  (if (member (event-modifiers (aref key 0)) '(nil (shift)))
-	      (push key non-modified-keys)))
-	(when remapped
-	  (princ "It is remapped to `")
-	  (princ (symbol-name remapped))
-	  (princ "'"))
-
-	(when keys
-	  (princ (if remapped " which is bound to " "It is bound to "))
-	  ;; FIXME: This list can be very long (f.ex. for self-insert-command).
-	  ;; If there are many, remove them from KEYS.
-	  (if (< (length non-modified-keys) 10)
-	      (princ (mapconcat 'key-description keys ", "))
-	    (dolist (key non-modified-keys)
-	      (setq keys (delq key keys)))
-	    (if keys
-		(progn
-		  (princ (mapconcat 'key-description keys ", "))
-		  (princ ", and many ordinary text characters"))
-	      (princ "many ordinary text characters"))))
-	(when (or remapped keys non-modified-keys)
-	  (princ ".")
-	  (terpri))))
+      (if (and (eq function 'self-insert-command)
+	       (eq (key-binding "a") 'self-insert-command)
+	       (eq (key-binding "b") 'self-insert-command)
+	       (eq (key-binding "c") 'self-insert-command))
+	  (princ "It is bound to many ordinary text characters.\n")
+	(let* ((remapped (command-remapping function))
+	       (keys (where-is-internal
+		      (or remapped function) overriding-local-map nil nil))
+	       non-modified-keys)
+	  ;; Which non-control non-meta keys run this command?
+	  (dolist (key keys)
+	    (if (member (event-modifiers (aref key 0)) '(nil (shift)))
+		(push key non-modified-keys)))
+	  (when remapped
+	    (princ "It is remapped to `")
+	    (princ (symbol-name remapped))
+	    (princ "'"))
+
+	  (when keys
+	    (princ (if remapped " which is bound to " "It is bound to "))
+	    ;; If lots of ordinary text characters run this command,
+	    ;; don't mention them one by one.
+	    (if (< (length non-modified-keys) 10)
+		(princ (mapconcat 'key-description keys ", "))
+	      (dolist (key non-modified-keys)
+		(setq keys (delq key keys)))
+	      (if keys
+		  (progn
+		    (princ (mapconcat 'key-description keys ", "))
+		    (princ ", and many ordinary text characters"))
+		(princ "many ordinary text characters"))))
+	  (when (or remapped keys non-modified-keys)
+	    (princ ".")
+	    (terpri)))))
     (let* ((arglist (help-function-arglist def))
 	   (doc (documentation function))
 	   (usage (help-split-fundoc doc function)))
diff --git a/lisp/ido.el b/lisp/ido.el
index ff222b2958c..480b76cd68c 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2611,7 +2611,7 @@ C-x C-f ... C-d  enter dired on current directory."
 May be useful if cached version is no longer valid, but directory
 timestamp has not changed (e.g. with ftp or on Windows)."
   (interactive)
-  (if (and ido-mode (eq ido-cur-item 'file))
+  (if (and ido-mode (memq ido-cur-item '(file dir)))
       (progn
 	(if (ido-is-unc-root)
 	    (setq ido-unc-hosts-cache t)
@@ -4168,7 +4168,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
 	    (setq refresh t))
 	   ((string-equal contents "./")
 	    (setq refresh t))
-	   ((string-match "\\`~[a-zA-Z0-9]+/\\'" contents)
+	   ((string-match "\\`~[-_a-zA-Z0-9]+[$]?/\\'" contents)
 	    (ido-trace "new home" contents)
 	    (ido-set-current-home contents)
 	    (setq refresh t))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 9557844a32a..ac87a93b7a1 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -541,6 +541,17 @@ This is relative to `smtpmail-queue-dir'.")
 		 (decoded (base64-decode-string challenge))
 		 (hash (rfc2104-hash 'md5 64 16 passwd decoded))
 		 (response (concat (smtpmail-cred-user cred) " " hash))
+		 ;; Osamu Yamane <yamane@green.ocn.ne.jp>:
+		 ;; SMTP auth fails because the SMTP server identifies
+		 ;; only the first part of the string (delimited by
+		 ;; new line characters) as a response from the
+		 ;; client, and the rest as distinct commands.
+
+		 ;; In my case, the response string is 80 characters
+		 ;; long.  Without the no-line-break option for
+		 ;; base64-encode-sting, only the first 76 characters
+		 ;; are taken as a response to the server, and the
+		 ;; authentication fails.
 		 (encoded (base64-encode-string response t)))
 	    (smtpmail-send-command process (format "%s" encoded))
 	    (if (or (null (car (setq ret (smtpmail-read-response process))))
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index bc00d859c2d..b1ca93e2f32 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -218,8 +218,8 @@ These files should contain one word per line, that gives the casing
 to be used for that word in Ada files.  If the line starts with the
 character *, then the exception will be used for substrings that either
 start at the beginning of a word or after a _ character, and end either
-at the end of the word or at a _ character.  Each line can be terminated by
-a comment."
+at the end of the word or at a _ character.  Each line can be terminated
+by a comment."
   :type '(repeat (file))
   :group 'ada)
 
@@ -439,10 +439,10 @@ An example is:
 (defcustom ada-which-compiler 'gnat
   "*Name of the compiler to use.
 This will determine what features are made available through the Ada mode.
-The possible choices are :
+The possible choices are:
 `gnat': Use Ada Core Technologies' Gnat compiler.  Add some cross-referencing
-    features
-`generic': Use a generic compiler"
+    features.
+`generic': Use a generic compiler."
   :type '(choice (const gnat)
                  (const generic))
   :group 'ada)
@@ -485,7 +485,7 @@ The extensions should include a `.' if needed.")
       "reverse" "select" "separate" "subtype" "task" "terminate" "then"
       "type" "use" "when" "while" "with" "xor")
     "List of Ada keywords.
-This variable is used to define `ada-83-keywords' and `ada-95-keywords'"))
+This variable is used to define `ada-83-keywords' and `ada-95-keywords'."))
 
 (defvar ada-ret-binding nil
   "Variable to save key binding of RET when casing is activated.")
@@ -532,7 +532,7 @@ See `align-mode-alist' for more information.")
      (valid   . (lambda() (not (ada-in-comment-p))))
      (modes   . '(ada-mode)))
     )
-  "Ada support for align.el >= 2.8
+  "Ada support for align.el >= 2.8.
 This variable defines several rules to use to align different lines.")
 
 (defconst ada-align-region-separate
@@ -1439,7 +1439,7 @@ The standard casing rules will no longer apply to this word."
           ((listp ada-case-exception-file)
            (setq file-name (car ada-case-exception-file)))
           (t
-           (error (concat "No exception file specified. "
+           (error (concat "No exception file specified.  "
 			  "See variable ada-case-exception-file"))))
 
     (set-syntax-table ada-mode-symbol-syntax-table)
@@ -1478,7 +1478,7 @@ word itself has a special casing."
 	       ((listp ada-case-exception-file)
 		(car ada-case-exception-file))
 	       (t
-		(error (concat "No exception file specified. "
+		(error (concat "No exception file specified.  "
 			       "See variable ada-case-exception-file"))))))
 
     ;;  Find the substring to define as an exception. Order is: the parameter,
@@ -1593,8 +1593,8 @@ word itself has a special casing."
 
 (defun ada-adjust-case-identifier ()
   "Adjust case of the previous identifier.
-The auto-casing is done according to the value of `ada-case-identifier' and
-the exceptions defined in `ada-case-exception-file'."
+The auto-casing is done according to the value of `ada-case-identifier'
+and the exceptions defined in `ada-case-exception-file'."
   (interactive)
   (if (or (equal ada-case-exception '())
           (equal (char-after) ?_))
@@ -1743,7 +1743,7 @@ ARG is ignored, and is there for compatibility with `capitalize-word' only."
 (defun ada-no-auto-case (&optional arg)
   "Do nothing.
 This function can be used for the auto-casing variables in the Ada mode, to
-adapt to unusal auto-casing schemes. Since it does nothing, you can for
+adapt to unusal auto-casing schemes.  Since it does nothing, you can for
 instance use it for `ada-case-identifier' if you don't want any special
 auto-casing for identifiers, whereas keywords have to be lower-cased.
 See also `ada-auto-case' to disable auto casing altogether."
@@ -1806,7 +1806,7 @@ Attention: This function might take very long for big regions!"
       (set-syntax-table previous-syntax-table))))
 
 (defun ada-adjust-case-buffer ()
-  "Adjusts the case of all words in the whole buffer.
+  "Adjust the case of all words in the whole buffer.
 ATTENTION: This function might take very long for big buffers!"
   (interactive "*")
   (ada-adjust-case-region (point-min) (point-max)))
@@ -2138,7 +2138,7 @@ Return the equivalent internal parameter list."
         (ada-indent-current))
       (forward-line 1)
       (setq block-done      (1+ block-done)))
-    (message "indenting ... done")))
+    (message "Indenting ... done")))
 
 (defun ada-indent-newline-indent ()
   "Indent the current line, insert a newline and then indent the new line."
@@ -3841,7 +3841,7 @@ If GOTOTHEN is non-nil, point moves to the 'then' following 'if'."
 (defun ada-goto-matching-end (&optional nest-level noerror)
   "Move point to the end of a block.
 Which block depends on the value of NEST-LEVEL, which defaults to zero.
-If NOERROR is non-nil, it only returns nil if found no matching start."
+If NOERROR is non-nil, it only returns nil if no matching start found."
   (let ((nest-count (or nest-level 0))
 	(regex (eval-when-compile
 		 (concat "\\<"
@@ -4058,7 +4058,7 @@ Assumes point to be at the end of a statement."
 
 (defun ada-looking-at-semi-private ()
   "Return t if looking at the start of a private section in a package.
-Returns nil if the private is part of the package name, as in
+Return nil if the private is part of the package name, as in
 'private package A is...' (this can only happen at top level)."
   (save-excursion
     (and (looking-at "\\<private\\>")
@@ -4968,7 +4968,7 @@ Redefines the function `ff-which-function-are-we-in'."
 
 
 (defvar ada-last-which-function-line -1
-  "Last on which `ada-which-function' was called.")
+  "Last line on which `ada-which-function' was called.")
 (defvar ada-last-which-function-subprog 0
   "Last subprogram name returned by `ada-which-function'.")
 (make-variable-buffer-local 'ada-last-which-function-subprog)
@@ -5062,7 +5062,7 @@ Since the search can be long, the results are cached."
 (defun ada-get-body-name (&optional spec-name)
   "Return the file name for the body of SPEC-NAME.
 If SPEC-NAME is nil, return the body for the current package.
-Returns nil if no body was found."
+Return nil if no body was found."
   (interactive)
 
   (unless spec-name (setq spec-name (buffer-file-name)))
@@ -5223,7 +5223,7 @@ Returns nil if no body was found."
   "Make text outside current subprogram invisible.
 The subprogram visible is the one that contains or follow point.
 Optional ARG is ignored.
-Use `M-x widen' to go back to the full visibility for the buffer."
+Use \\[widen] to go back to the full visibility for the buffer."
 
   (interactive)
   (save-excursion
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 9e3f8e14332..05d2a8bf65b 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1916,8 +1916,12 @@ is using."
       (set-buffer (get-buffer-create "*grep*"))
       (while dirs
 	(insert (shell-command-to-string
-		 (concat "egrep -i -h '^X|" regexp "( |$)' "
-			 (file-name-as-directory (car dirs)) "*.ali")))
+		 (concat
+		  "grep -E -i -h "
+		  (shell-quote-argument (concat "^X|" regexp "( |$)"))
+		  " "
+		  (shell-quote-argument (file-name-as-directory (car dirs)))
+		  "*.ali")))
 	(set 'dirs (cdr dirs)))
 
       ;;  Now parse the output
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 4f197e34bfe..b37be18188c 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1021,7 +1021,9 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
       (progn
 	(flymake-get-project-include-dirs-from-cache basedir))
     ;;else
-    (let* ((command-line  (concat "make -C\"" basedir "\" DUMPVARS=INCLUDE_DIRS dumpvars"))
+    (let* ((command-line  (concat "make -C "
+				  (shell-quote-argument basedir)
+				  " DUMPVARS=INCLUDE_DIRS dumpvars"))
 	   (output        (shell-command-to-string command-line))
 	   (lines         (flymake-split-string output "\n"))
 	   (count         (length lines))
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 02e7e712399..ca288100b98 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1318,9 +1318,7 @@ With prefix argument ARG, turn on if positive, otherwise off.
 Returns non-nil if the new state is enabled.
 
 When recentf mode is enabled, it maintains a menu for visiting files
-that were operated on recently.
-
-\\{recentf-mode-map}"
+that were operated on recently."
   :global t
   :group 'recentf
   :keymap recentf-mode-map
diff --git a/lisp/shell.el b/lisp/shell.el
index 2adfc79618a..d3e23251a1f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -298,7 +298,9 @@ Value is a list of strings, which may be nil."
 	     (equal name "bash")
 	     (file-executable-p prog)
 	     (string-match "bad option"
-			   (shell-command-to-string (concat prog " --noediting"))))
+			   (shell-command-to-string
+			    (concat (shell-quote-argument prog)
+				    " --noediting"))))
 	'("-i")
       '("--noediting" "-i")))
   "Args passed to inferior shell by \\[shell], if the shell is bash.
diff --git a/lisp/simple.el b/lisp/simple.el
index 0dff1c73795..8fc0fdf6b48 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -985,12 +985,11 @@ in *Help* buffer.  See also the command `describe-char'."
 		     (single-key-description char))
 		   encoding-msg pos total percent col hscroll))))))
 
-(defvar read-expression-map
-  (let ((m (make-sparse-keymap)))
-    (define-key m "\M-\t" 'lisp-complete-symbol)
-    (set-keymap-parent m minibuffer-local-map)
-    m)
-  "Minibuffer keymap used for reading Lisp expressions.")
+;; Initialize read-expression-map.  It is defined at C level.
+(let ((m (make-sparse-keymap)))
+  (define-key m "\M-\t" 'lisp-complete-symbol)
+  (set-keymap-parent m minibuffer-local-map)
+  (setq read-expression-map m))
 
 (defvar read-expression-history nil)
 
@@ -3617,7 +3616,14 @@ Outline mode sets this."
 	      ;; The logic of this is the same as the loop above,
 	      ;; it just goes in the other direction.
 	      (while (and (< arg 0) (not done))
-		(beginning-of-line)
+		;; For completely consistency with the forward-motion
+		;; case, we should call beginning-of-line here.
+		;; However, if point is inside a field and on a
+		;; continued line, the call to (vertical-motion -1)
+		;; below won't move us back far enough; then we return
+		;; to the same column in line-move-finish, and point
+		;; gets stuck -- cyd
+		(forward-line 0)
 		(cond
 		 ((bobp)
 		  (if (not noerror)
diff --git a/lisp/subr.el b/lisp/subr.el
index ad3e732c6c6..1f947a795f9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2195,6 +2195,12 @@ If UNDO is present and non-nil, it is a function that will be called
 
     (unless (nth 2 handler) ;; NOEXCLUDE
       (remove-yank-excluded-properties opoint (point)))
+
+    ;; If last inserted char has properties, mark them as rear-nonsticky.
+    (if (and (> end opoint)
+	     (text-properties-at (1- end)))
+	(put-text-property (1- end) end 'rear-nonsticky t))
+
     (if (eq yank-undo-function t)  ;; not set by FUNCTION
 	(setq yank-undo-function (nth 3 handler))) ;; UNDO
     (if (nth 4 handler) ;; COMMAND
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index aba5c6d1e4c..ec058e97c1e 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2477,12 +2477,15 @@ order until succeed.")
 				 (cons '(user-size . t) parsed))))
 	  ;; All geometry parms apply to the initial frame.
 	  (setq initial-frame-alist (append initial-frame-alist parsed))
-	  ;; The size parms apply to all frames.
-	  (if (assq 'height parsed)
+	  ;; The size parms apply to all frames.  Don't set it if there are 
+	  ;; sizes there already (from command line).
+	  (if (and (assq 'height parsed)
+		   (not (assq 'height default-frame-alist)))
 	      (setq default-frame-alist
 		    (cons (cons 'height (cdr (assq 'height parsed)))
 			  default-frame-alist)))
-	  (if (assq 'width parsed)
+	  (if (and (assq 'width parsed)
+		   (not (assq 'width default-frame-alist)))
 	      (setq default-frame-alist
 		    (cons (cons 'width (cdr (assq 'width parsed)))
 			  default-frame-alist))))))
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index ebee4691e8c..e7b95c9619d 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -959,6 +959,7 @@ Mostly we check word delimiters."
 (defun flyspell-word-search-backward (word bound)
   (save-excursion
     (let ((r '())
+	  (inhibit-point-motion-hooks t)
 	  p)
       (while (and (not r) (setq p (search-backward word bound t)))
 	(let ((lw (flyspell-get-word '())))
@@ -973,6 +974,7 @@ Mostly we check word delimiters."
 (defun flyspell-word-search-forward (word bound)
   (save-excursion
     (let ((r '())
+	  (inhibit-point-motion-hooks t)
 	  p)
       (while (and (not r) (setq p (search-forward word bound t)))
 	(let ((lw (flyspell-get-word '())))
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 002ab9dac11..169eeb249f2 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -614,6 +614,7 @@
 ;;; Code:
 
 
+(require 'regexp-opt)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2aa14af8983..2d26bc805a7 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Magnus Henoch  <mange@freemail.hu>
+
+	* url-http.el (url-https-create-secure-wrapper): Always use tls
+	gateway method.
+
 2006-10-12  Magnus Henoch  <mange@freemail.hu>
 
 	* url-http.el (url-http-find-free-connection): Handle
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index bf8069ded7e..958d90683e4 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1261,9 +1261,7 @@ p3p
 (defmacro url-https-create-secure-wrapper (method args)
   `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args
     ,(format "HTTPS wrapper around `%s' call." (or method "url-http"))
-    (let ((url-gateway-method (condition-case ()
-				  (require 'ssl)
-				(error 'tls))))
+    (let ((url-gateway-method 'tls))
       (,(intern (format (if method "url-http-%s" "url-http") method))
        ,@(remove '&rest (remove '&optional args))))))
 
diff --git a/lisp/woman.el b/lisp/woman.el
index 13fa3147487..b25a93d86a8 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -4121,7 +4121,11 @@ If `woman-nofill' is non-nil then indent without filling or adjusting."
 	       (eolp)
 	       (skip-syntax-forward " ")
 	       (setq woman-leave-blank-lines 1))
-	  (beginning-of-line)
+	  ;; This shouldn't happen, but in case it does (e.g. for
+	  ;; badly-formatted manfiles with no terminating newline),
+	  ;; avoid an infinite loop.
+	  (unless (and (eolp) (eobp))
+	    (beginning-of-line))
 	  ;; If a single short line then just leave it.
 	  ;; This is necessary to preserve some table layouts.
 	  ;; PROBABLY NOT NECESSARY WITH SQUEEZE MODIFICATION !!!!!