Re: [PATCH 2/2] emacs: Add interface for comparing generations.

[Alex Kost <alezost@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1711 bytes --]

Ludovic Courtès (2014-11-04 01:22 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:

[...]

>> Perhaps "s/The Emacs Editor/The GNU Emacs Manual/"?  As it's the most
>> common (but not the one) variant in the Emacs Lisp manual, for example here:
>> <http://git.savannah.gnu.org/cgit/emacs.git/tree/doc/lispref/display.texi#n2065>
>
> OK (I think they should add “The” in emacs.texi.)
>
>> Also I used "The Emacs Editor" several times in “emacs.texi”.  Should I
>> replace all instances in this patch or make a separate commit for that?
>
> Yes, please.

Sorry, yes for «replace all instances in this patch» or for «make a
separate commit»?  I think the latter, so I've attached a patch for
that.  OK to commit?

>> Just out of curiosity.  Do you usually prefer "diff" over "ediff"?
>> (I find the latter much convenient)
>
> The default behavior for ediff is to create another frame for control,
> and that doesn’t work well with the tiling window manager I’m using.
> Also, it’s really a mode that you enter and have to leave afterwards.
> So I tend to prefer diff for simple diffs, and I resort to ediff in more
> tricky situations (like when I have to compare two .drv files for
> debugging, uh! ;-)).

Oh, indeed; I forgot about the defaults.  Yeah, additional frame and
vertical splitting are evil :-)  So I use the following settings:

  (setq
   ediff-window-setup-function #'ediff-setup-windows-plain ; no new frame
   ediff-split-window-function #'split-window-horizontally
   ediff-grab-mouse nil)

But the most unpleasant default behaviour for me is that Ediff doesn't
restore the previous window configuration.  To "fix" it, I use:


[-- Attachment #2: ediff-tmp.el --]
[-- Type: application/emacs-lisp, Size: 582 bytes --]

[-- Attachment #3: Type: text/plain, Size: 174 bytes --]


Sorry for being verbose on an unrelated topic, but maybe someone who
will read it, find it useful (I also recommend to look at
<http://www.emacswiki.org/emacs/EdiffMode>).


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0001-doc-emacs-Fix-titles-of-the-printed-manuals.patch --]
[-- Type: text/x-diff, Size: 3879 bytes --]

From ae8f292fba3fee0b89a877a7ad61045d2bc91e2c Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Tue, 4 Nov 2014 10:20:41 +0300
Subject: [PATCH] doc: emacs: Fix titles of the printed manuals.

* doc/emacs.texi: Use the proper names of the printed manuals in the
  cross references.
---
 doc/emacs.texi | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/doc/emacs.texi b/doc/emacs.texi
index 1b134d7..1d7711a 100644
--- a/doc/emacs.texi
+++ b/doc/emacs.texi
@@ -38,7 +38,7 @@ used for interacting with the Guile process.
 @end itemize
 
 When it is done, add the following into your init file (@pxref{Init
-File,,, emacs, The Emacs Editor}):
+File,,, emacs, The GNU Emacs Manual}):
 
 @example
 (require 'guix-init nil t)
@@ -47,7 +47,8 @@ File,,, emacs, The Emacs Editor}):
 However there is a chance that @code{load-path} of your Emacs does not
 contain a directory with ``guix.el'' (usually it is
 @file{/usr/share/emacs/site-lisp/}).  In that case you need to add it
-before requiring (@pxref{Lisp Libraries,,, emacs, The Emacs Editor}):
+before requiring (@pxref{Lisp Libraries,,, emacs, The GNU Emacs
+Manual}):
 
 @example
 (add-to-list 'load-path "/path/to/directory-with-guix.el")
@@ -56,7 +57,8 @@ before requiring (@pxref{Lisp Libraries,,, emacs, The Emacs Editor}):
 
 Do not worry about the efficiency of that @code{require} thing.  It will
 not load the whole ``guix.el'' package, it will just autoload the main
-interactive commands (@pxref{Autoload,,, elisp, Emacs Lisp}).
+interactive commands (@pxref{Autoload,,, elisp, The Emacs Lisp Reference
+Manual}).
 
 
 @node Emacs Usage
@@ -129,7 +131,7 @@ of generations.
 @item M-x guix-generations-by-time
 List generations matching time period.  You will be prompted for the
 period using Org mode time prompt based on Emacs calendar (@pxref{The
-date/time prompt,,, org, Org Mode Manual}).
+date/time prompt,,, org, The Org Manual}).
 
 @end table
 
@@ -187,7 +189,7 @@ was restarted, you may want to revert ``list'' buffer (by pressing
 @subsubsection ``List'' buffer
 
 An interface of a ``list'' buffer is similar to the interface provided
-by ``package.el'' (@pxref{Package Menu,,, emacs, The Emacs Editor}).
+by ``package.el'' (@pxref{Package Menu,,, emacs, The GNU Emacs Manual}).
 
 Default key bindings available for both ``package-list'' and
 ``generation-list'' buffers:
@@ -260,11 +262,11 @@ with another marked generation.
 @subsubsection ``Info'' buffer
 
 The interface of an ``info'' buffer is similar to the interface of
-@code{help-mode} (@pxref{Help Mode,,, emacs, The Emacs Editor}).
+@code{help-mode} (@pxref{Help Mode,,, emacs, The GNU Emacs Manual}).
 
 ``Info'' buffer contains some buttons (as usual you may use @key{TAB} /
 @kbd{S-@key{TAB}} to move between buttons---@pxref{Mouse References,,,
-emacs, The Emacs Editor}) which can be used to:
+emacs, The GNU Emacs Manual}) which can be used to:
 
 @itemize @bullet
 @item (in a ``package-info'' buffer)
@@ -294,8 +296,8 @@ emacs, The Emacs Editor}) which can be used to:
 There are many variables you can modify to change the appearance or
 behavior of Emacs user interface.  Some of these variables are described
 in this section.  Also you can use Custom Interface (@pxref{Easy
-Customization,,, emacs, The Emacs Editor}) to explore/set variables (not
-all) and faces.
+Customization,,, emacs, The GNU Emacs Manual}) to explore/set variables
+(not all) and faces.
 
 @menu
 * Guile and Build Options: Emacs Build Options.	Specifying how packages are built.
@@ -367,7 +369,7 @@ extensively), you may do it like this:
 @subsubsection Keymaps
 
 If you want to change default key bindings, use the following keymaps
-(@pxref{Init Rebinding,,, emacs, The Emacs Editor}):
+(@pxref{Init Rebinding,,, emacs, The GNU Emacs Manual}):
 
 @table @code
 @item guix-list-mode-map
-- 
2.1.2