+2011-02-05 Chong Yidong <cyd@stupidchicken.com>
+
+ * rmail.texi (Rmail Display): Document Rmail MIME support more
+ accurately.
+
+ * maintaining.texi (VC Change Log): Document vc-log-incoming and
+ vc-log-outgoing.
+ (Merging): Document vc-find-conflicted-file.
+
2011-02-04 Glenn Morris <rgm@gnu.org>
* custom.texi (Variables): Fix typo.
@item C-x v L
Display the change history for the current repository
(@code{vc-print-root-log}).
+
+@item C-x v I
+Display the changes that will be received with a pull operation
+(@code{vc-log-incoming}).
+
+@item C-x v O
+Display the changes that will be sent by the next push operation
+(@code{vc-log-outgoing}).
@end table
@kindex C-x v l
the command prompts for the maximum number of revisions to display.
RCS, SCCS, and CVS do not support this feature.
+ On a distributed version control system, the @kbd{C-x v I}
+(@code{vc-log-incoming}) command displays a log buffer showing the
+changes that will be applied, the next time you run the version
+control system's ``pull'' command to get new revisions from another
+repository. This other repository is the default one from which
+changes are pulled, as defined by the version control system; with a
+prefix argument, @code{vc-log-incoming} prompts for a specific
+repository from which changes would be pulled, and lists the changes
+accordingly. Similarly, @kbd{C-x v O} (@code{vc-log-outgoing}) shows
+the changes that will be sent to another repository, the next time you
+run the ``push'' command; with a prefix argument, it prompts for a
+specific repository to which changes would be pushed.
+
In the @samp{*vc-change-log*} buffer, you can use the following keys
to move between the logs of revisions and of files, to view past
revisions, to modify change comments, to view annotations and to view
@end group
@end smallexample
-@cindex vc-resolve-conflicts
+@findex vc-resolve-conflicts
Then you can resolve the conflicts by editing the file manually. Or
you can type @code{M-x vc-resolve-conflicts} after visiting the file.
This starts an Ediff session, as described above. Don't forget to
commit the merged version afterwards.
+@findex vc-find-conflicted-file
+ If there is more than one conflicted file in a merge, type @kbd{M-x
+vc-find-conflicted-file} after resolving the conflicts in each file.
+This command visits the next conflicted file, and moves point to the
+first conflict marker in that file.
+
@node Multi-User Branching
@subsubsection Multi-User Branching
@cindex MIME messages (Rmail)
@vindex rmail-enable-mime
- By default, Rmail automatically decodes @acronym{MIME} (Multipurpose
-Internet Mail Extensions) messages. If the message contains multiple
-parts (@acronym{MIME} entities), each part is represented by a tagline
-in the Rmail buffer. The tagline summarizes the part's depth, index,
-and type, and may also contain a button for handling it, e.g. saving
-it to a file or displaying it as an image in the Rmail buffer.
+ If a message is in @acronym{MIME} (Multipurpose Internet Mail
+Extensions) format and contains multiple parts (@acronym{MIME}
+entities), Rmail displays each part with a @dfn{tagline}. The tagline
+summarizes the part's index, size, and content type. Depending on the
+content type, it may also contain one or more buttons; these perform
+actions such as saving the part into a file.
@table @kbd
@findex rmail-mime-toggle-hidden
@findex rmail-mime-next-item
@item @key{TAB}
-Move point to the next @acronym{MIME} part
+Move point to the next @acronym{MIME} tagline button.
(@code{rmail-mime-next-item}).
@findex rmail-mime-previous-item
(@code{rmail-mime}).
@end table
+ Each plain-text @acronym{MIME} part is initially displayed
+immediately after its tagline, as part of the Rmail buffer, while
+@acronym{MIME} parts of other types are represented only by their
+taglines, with their actual contents hidden. In either case, you can
+toggle a @acronym{MIME} part between its ``displayed'' and ``hidden''
+states by typing @key{RET} anywhere in the part---or anywhere in its
+tagline, apart from a tagline button for some other action. Type
+@key{RET} (or click with the mouse) to activate a tagline button, and
+@key{TAB} to cycle point between tagline buttons.
+
The @kbd{v} (@code{rmail-mime}) command toggles between the default
@acronym{MIME} display described above, and a ``raw'' display showing
the undecoded @acronym{MIME} data. With a prefix argument, this
+2011-02-05 Chong Yidong <cyd@stupidchicken.com>
+
+ * commands.texi (Accessing Mouse): Note that a header line is not
+ included in the row of posn-col-row.
+
2011-01-28 Chong Yidong <cyd@stupidchicken.com>
* vol1.texi (Top):
@end defun
@defun posn-col-row position
-Return the row and column (in units of the frame's default character
-height and width) of @var{position}, as a cons cell @code{(@var{col} .
-@var{row})}. These are computed from the @var{x} and @var{y} values
-actually found in @var{position}.
+This function returns a cons cell @code{(@var{col} . @var{row})},
+containing the estimated column and row corresponding to buffer
+position @var{position}. The return value is given in units of the
+frame's default character width and height, as computed from the
+@var{x} and @var{y} values corresponding to @var{position}. (So, if
+the actual characters have non-default sizes, the actual row and
+column may differ from these computed values.)
+
+Note that @var{row} is counted from the top of the text area. If the
+window possesses a header line (@pxref{Header Lines}), it is
+@emph{not} counted as the first line.
@end defun
@defun posn-actual-col-row position
\f
* Installation Changes in Emacs 23.3
----
** New configure option --with-crt-dir specifies the location of your
crt*.o files, if they are in a non-standard location. This is only
used on x86-64 and s390x GNU/Linux architectures.
-* Startup Changes in Emacs 23.3
-
* Changes in Emacs 23.3
-+++
** The last-resort backup file `%backup%~' is now written to
`user-emacs-directory', instead of the user's home directory.
-\f
-* Editing Changes in Emacs 23.3
+** If Emacs creates `user-emacs-directory', that directory's
+permissions are now set to rwx------, ignoring the umask.
\f
* Changes in Specialized Modes and Packages in Emacs 23.3
----
-** The appt-add command takes an optional argument for the warning time.
+** Calendar and diary
+
+*** The appt-add command takes an optional argument, the warning time.
This can be used in place of the default appt-message-warning-time.
----
-** You can allow inferior Python processes to load modules from the
+** Python mode
+
+*** You can allow inferior Python processes to load modules from the
current directory by setting `python-remove-cwd-from-path' to nil.
+** Rmail
+
+*** The default value of `rmail-enable-mime' is now t. Rmail decodes
+MIME contents automatically. You can customize the variable
+`rmail-enable-mime' back to `nil' to disable this automatic MIME
+decoding.
+
+*** The command `rmail-mime' change the displaying of a MIME message
+between decoded presentation form and raw data if `rmail-enable-mime'
+is non-nil. And, with prefix argument, it change only the displaying
+of the MIME entity at point.
+
+*** The new command `rmail-mime-next-item' (bound to TAB) moves point
+to the next item of MIME message.
+
+*** The new command `rmail-mime-previous-item' (bound to backtab) moves
+point to the previous item of MIME message.
+
+*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
+body of the MIME entity at point.
+
** VC and related modes
*** New VC command `vc-log-incoming', bound to `C-x v I'.
*** New VC command vc-find-conflicted-file.
-+++
*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
reruns the corresponding VC command to compute an up to date version
of the buffer.
*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
-+++
*** Special markup can be added to log-edit buffers.
You can add headers specifying additional information to be supplied
to the version control system. For example:
Git, Mercurial, and Monotone recognize "Author" and "Date".
Any unknown header is left as is in the message, so it is not lost.
-** Rmail
-
-*** The default value of `rmail-enable-mime' is now t. Rmail decodes
-MIME contents automatically. You can customize the variable
-`rmail-enable-mime' back to `nil' to disable this automatic MIME
-decoding.
-
-*** The command `rmail-mime' change the displaying of a MIME message
-between decoded presentation form and raw data if `rmail-enable-mime'
-is non-nil. And, with prefix argument, it change only the displaying
-of the MIME entity at point.
-
-*** The new command `rmail-mime-next-item' (bound to TAB) moves point
-to the next item of MIME message.
-
-*** The new command `rmail-mime-previous-item' (bound to backtab) moves
-point to the previous item of MIME message.
-
-*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
-body of the MIME entity at point.
-
** Obsolete packages
-+++
*** lmenu.el and cl-compat.el are now obsolete.
\f
\f
* Lisp changes in Emacs 23.3
-+++
** `e' and `pi' are now called `float-e' and `float-pi'.
The old names are obsolete.
-+++
** The use of unintern without an obarray arg is now obsolete.
----
** The function `princ-list' is now obsolete.
-+++
** The yank-handler argument to kill-region and friends is now obsolete.
-+++
** New function byte-to-string, like char-to-string but for bytes.
\f
* Changes in Emacs 23.3 on non-free operating systems
-+++
** The nextstep port can have different modifiers for the left and right
alt/option key by customizing the value for ns-right-alternate-modifier.
HCoop / bpt / emacs.git / commitdiff