/srv/bzr/emacs/trunk r108358: Use the same diff color scheme as in modern VCSes (bug#10181).

------------------------------------------------------------
revno: 108358
committer: Juri Linkov <juri <at> jurta.org>
branch nick: trunk
timestamp: Fri 2012-05-25 03:55:40 +0300
message:
  Use the same diff color scheme as in modern VCSes (bug#10181).

  * lisp/vc/diff-mode.el (diff-header, diff-file-header): Remove "green"
  to avoid confusion with `diff-added' that now uses green colors.
  (diff-removed): Use shades of red.
  (diff-added): Use shades of green.
  (diff-changed): Leave just the yellow color.
  (diff-use-changed-face): New variable.
  (diff-font-lock-keywords): Use `diff-use-changed-face' to decide
  how to highlight context diff changes.
  (diff-refine-change): Use shades of yellow.
  (diff-refine-removed): New face that uses shades of red.
  (diff-refine-added): New face that uses shades of green.
  (diff-refine-hunk): Use `diff-refine-change', `diff-refine-added',
  `diff-refine-removed' in the call to `smerge-refine-subst'
  depending on the value of `diff-use-changed-face'.

  * lisp/vc/ediff-init.el (ediff-current-diff-A, ediff-fine-diff-A):
  Add face condition `min-colors 88' with shades of red.
  (ediff-current-diff-B, ediff-fine-diff-B): Add face condition
  `min-colors 88' with shades of green.
  (ediff-current-diff-C, ediff-fine-diff-C): Add face condition
  `min-colors 88' with shades of yellow.

/srv/bzr/emacs/trunk r108357: Fix previous (slogin and rlogin not appropriate for remote-shell-program)

------------------------------------------------------------
revno: 108357
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 17:27:22 -0400
message:
  Fix previous (slogin and rlogin not appropriate for remote-shell-program)
modified:
  lisp/files.el

=== modified file 'lisp/files.el'
--- a/lisp/files.el	2012-05-24 20:40:19 +0000
+++ b/lisp/files.el	2012-05-24 21:27:22 +0000
@@ -998,7 +998,7 @@
   ;; in this day and age.  Almost everyone will use ssh, and have
   ;; whatever command they want to use in PATH.
   (purecopy
-   (let ((list '("ssh" "slogin" "rlogin" "remsh" "rcmd" "rsh")))
+   (let ((list '("ssh" "remsh" "rcmd" "rsh")))
      (while (and list
 		 (not (executable-find (car list)))
 		 (setq list (cdr list))))

/srv/bzr/emacs/trunk r108356: Move prune-directory-list, remote-shell-program from paths.el to files.el

------------------------------------------------------------
revno: 108356
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 16:40:19 -0400
message:
  Move prune-directory-list, remote-shell-program from paths.el to files.el

  * lisp/paths.el (prune-directory-list, remote-shell-program): Move to ...
  * lisp/files.el (prune-directory-list, remote-shell-program): ...here.
  For the latter, delay initialization, prefer ssh, just search PATH.
modified:
  lisp/ChangeLog
  lisp/files.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-24 07:53:21 +0000
+++ b/lisp/ChangeLog	2012-05-24 20:40:19 +0000
@@ -1,5 +1,9 @@
 2012-05-24  Glenn Morris  <rgm <at> gnu.org>

+	* paths.el (prune-directory-list, remote-shell-program): Move to...
+	* files.el (prune-directory-list, remote-shell-program): ...here.
+	For the latter, delay initialization, prefer ssh, just search PATH.
+
 	* paths.el (term-file-prefix): Move to faces.el (the only user).
 	* faces.el (term-file-prefix): Move here, make it a defcustom.

/srv/bzr/emacs/emacs-24 r108013: * src/callproc.c (Fcall_process): Restore a line that was accidentally commented out (bug#11547).

------------------------------------------------------------
revno: 108013
committer: Ken Brown <kbrown <at> cornell.edu>
branch nick: emacs-24
timestamp: Thu 2012-05-24 07:21:34 -0400
message:
  * src/callproc.c (Fcall_process): Restore a line that was accidentally commented out (bug#11547).
modified:
  src/ChangeLog
  src/callproc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog	2012-05-23 17:32:28 +0000
+++ b/src/ChangeLog	2012-05-24 11:21:34 +0000
@@ -1,3 +1,8 @@
+2012-05-24  Ken Brown  <kbrown <at> cornell.edu>
+
+	* callproc.c (Fcall_process): Restore a line that was accidentally
+	commented out in the 2011-02-13 change (bug#11547).
+
 2012-05-23  Eli Zaretskii  <eliz <at> gnu.org>

 	* lisp.h [REL_ALLOC]: Add prototypes for external functions

=== modified file 'src/callproc.c'
--- a/src/callproc.c	2012-02-02 07:21:20 +0000
+++ b/src/callproc.c	2012-05-24 11:21:34 +0000
@@ -640,7 +640,7 @@

/srv/bzr/emacs/trunk r108355: * lisp/paths.el (term-file-prefix): Move to lisp/faces.el (the only user).

------------------------------------------------------------
revno: 108355
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 00:53:21 -0700
message:
  * lisp/paths.el (term-file-prefix): Move to lisp/faces.el (the only user).
  * faces.el (term-file-prefix): Move here, make it a defcustom.
modified:
  lisp/ChangeLog
  lisp/faces.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-24 07:31:45 +0000
+++ b/lisp/ChangeLog	2012-05-24 07:53:21 +0000
@@ -1,5 +1,8 @@
 2012-05-24  Glenn Morris  <rgm <at> gnu.org>

+	* paths.el (term-file-prefix): Move to faces.el (the only user).
+	* faces.el (term-file-prefix): Move here, make it a defcustom.
+
 	* paths.el (news-directory, news-path, news-inews-program):
 	Move to gnus/nnspool.el.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el	2012-04-22 18:04:54 +0000
+++ b/lisp/faces.el	2012-05-24 07:53:21 +0000
@@ -28,6 +28,16 @@

/srv/bzr/emacs/trunk r108354: * paths.el (news-inews-program): Move to gnus/nnspool.el.

------------------------------------------------------------
revno: 108354
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 00:31:45 -0700
message:
  * paths.el (news-inews-program): Move to gnus/nnspool.el.

  * gnus/nnspool.el (news-inews-program): Move here from paths.el.
  Don't see a need for this to be autoloaded.  (Or even to exist; it is
  only used to init another variable.)
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/nnspool.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-24 07:27:24 +0000
+++ b/lisp/ChangeLog	2012-05-24 07:31:45 +0000
@@ -1,6 +1,7 @@
 2012-05-24  Glenn Morris  <rgm <at> gnu.org>

-	* paths.el (news-directory, news-path): Move to gnus/nnspool.el.
+	* paths.el (news-directory, news-path, news-inews-program):
+	Move to gnus/nnspool.el.

 	* paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).

/srv/bzr/emacs/trunk r108353: * paths.el (news-directory, news-path): Move to gnus/nnspool.el.

------------------------------------------------------------
revno: 108353
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 00:27:24 -0700
message:
  * paths.el (news-directory, news-path): Move to gnus/nnspool.el.

  * gnus/nnspool.el (news-directory, news-path): Move here from paths.el.
  Don't see a need for these to be autoloaded.  This file is the only
  place that uses them, to init another variable.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/nnspool.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-24 07:11:19 +0000
+++ b/lisp/ChangeLog	2012-05-24 07:27:24 +0000
@@ -1,5 +1,7 @@
 2012-05-24  Glenn Morris  <rgm <at> gnu.org>

+	* paths.el (news-directory, news-path): Move to gnus/nnspool.el.
+
 	* paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).

 	* paths.el (rmail-file-name, rmail-spool-directory): Move from here...

/srv/bzr/emacs/trunk r108352: Add missing autload pieces needed for rmail-spool-directory's delayed init

------------------------------------------------------------
revno: 108352
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 00:20:34 -0700
message:
  Add missing autload pieces needed for rmail-spool-directory's delayed init
modified:
  lisp/mail/rmail.el

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el	2012-05-24 06:53:08 +0000
+++ b/lisp/mail/rmail.el	2012-05-24 07:20:34 +0000
@@ -149,6 +149,13 @@
   :version "21.1")

 ;;;###autoload
+(put 'rmail-spool-directory 'standard-value
+     '((cond ((file-exists-p "/var/mail") "/var/mail/")
+	     ((file-exists-p "/var/spool/mail") "/var/spool/mail/")
+	     ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/")
+	     (t "/usr/spool/mail/"))))
+
+;;;###autoload
 (defcustom rmail-spool-directory
   (purecopy
   (cond ((file-exists-p "/var/mail")
@@ -166,6 +173,8 @@
   :type 'directory

/srv/bzr/emacs/trunk r108349: * paths.el (gnus-nntp-service, gnus-local-organization): Remove.

------------------------------------------------------------
revno: 108349
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Wed 2012-05-23 23:42:26 -0700
message:
  * paths.el (gnus-nntp-service, gnus-local-organization): Remove.
  These were deleted from Gnus itself late 2010.
modified:
  lisp/ChangeLog
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-22 18:31:19 +0000
+++ b/lisp/ChangeLog	2012-05-24 06:42:26 +0000
@@ -1,3 +1,8 @@
+2012-05-24  Glenn Morris  <rgm <at> gnu.org>
+
+	* paths.el (gnus-nntp-service, gnus-local-organization): Remove.
+	These were deleted from Gnus itself late 2010.
+
 2012-05-22  Juanma Barranquero  <lekktu <at> gmail.com>

 	* progmodes/which-func.el (which-func-ff-hook):

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el	2012-01-19 07:21:25 +0000
+++ b/lisp/paths.el	2012-05-24 06:42:26 +0000
@@ -1,6 +1,6 @@

/srv/bzr/emacs/trunk r108350: Move some rmail variables from paths.el to rmail.el

------------------------------------------------------------
revno: 108350
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Wed 2012-05-23 23:53:08 -0700
message:
  Move some rmail variables from paths.el to rmail.el

  Ref eg
  http://lists.gnu.org/archive/html/emacs-devel/2004-10/msg00620.html

  * paths.el (rmail-file-name, rmail-spool-directory): Move from here...
  * mail/rmail.el (rmail-file-name, rmail-spool-directory): ... to here.
  Make the latter a defcustom, with a delayed initialization.
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-24 06:42:26 +0000
+++ b/lisp/ChangeLog	2012-05-24 06:53:08 +0000
@@ -1,5 +1,9 @@
 2012-05-24  Glenn Morris  <rgm <at> gnu.org>

+	* paths.el (rmail-file-name, rmail-spool-directory): Move from here...
+	* mail/rmail.el (rmail-file-name, rmail-spool-directory): ... to here.
+	Make the latter a defcustom, with a delayed initialization.
+

/srv/bzr/emacs/trunk r108351: No need to define gnus-default-nntp-server in paths.el

------------------------------------------------------------
revno: 108351
committer: Glenn Morris <rgm <at> gnu.org>
branch nick: trunk
timestamp: Thu 2012-05-24 00:11:19 -0700
message:
  No need to define gnus-default-nntp-server in paths.el

  Don't see a need for this to be autoloaded, since it is only used in
  gnus.el (in one place, as a fallback).  Maybe it should be obsolete?

  * paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).

  * gnus/gnus.el (gnus-default-nntp-server): Make it a defcustom.
  Merge in doc from paths.el version.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/gnus.el
  lisp/paths.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog	2012-05-24 06:53:08 +0000
+++ b/lisp/ChangeLog	2012-05-24 07:11:19 +0000
@@ -1,5 +1,7 @@
 2012-05-24  Glenn Morris  <rgm <at> gnu.org>

+	* paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
+