[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111426: Merge from emacs-24; up to r
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111426: Merge from emacs-24; up to r111143 |
|
Date: |
Sat, 05 Jan 2013 13:18:01 -0800 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111426 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-01-05 13:18:01 -0800
message:
Merge from emacs-24; up to r111143
modified:
doc/emacs/ChangeLog
doc/emacs/text.texi
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/hooks.texi
doc/lispref/keymaps.texi
doc/misc/ChangeLog
doc/misc/ada-mode.texi
doc/misc/auth.texi
doc/misc/ede.texi
doc/misc/emacs-gnutls.texi
doc/misc/eshell.texi
doc/misc/eudc.texi
doc/misc/forms.texi
doc/misc/htmlfontify.texi
doc/misc/org.texi
doc/misc/pcl-cvs.texi
doc/misc/pgg.texi
doc/misc/reftex.texi
doc/misc/smtpmail.texi
doc/misc/tramp.texi
doc/misc/vip.texi
doc/misc/viper.texi
src/ChangeLog
src/xdisp.c
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2013-01-02 16:13:04 +0000
+++ b/doc/emacs/ChangeLog 2013-01-05 21:18:01 +0000
@@ -1,3 +1,7 @@
+2013-01-05 Glenn Morris <address@hidden>
+
+ * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
+
2012-12-21 Glenn Morris <address@hidden>
* emacs-xtra.texi (copying): The FSF does not sell copies of this.
=== modified file 'doc/emacs/text.texi'
--- a/doc/emacs/text.texi 2013-01-01 09:11:05 +0000
+++ b/doc/emacs/text.texi 2013-01-05 19:21:17 +0000
@@ -1917,7 +1917,7 @@
The major mode for editing XML documents is called nXML mode. This
is a powerful major mode that can recognize many existing XML schema
and use them to provide completion of XML elements via
address@hidden@key{RET}} or @address@hidden, as well as ``on-the-fly'' XML
address@hidden@key{TAB}}, as well as ``on-the-fly'' XML
validation with error highlighting. To enable nXML mode in an
existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x
xml-mode}. Emacs uses nXML mode for files which have the extension
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2013-01-04 19:22:37 +0000
+++ b/doc/lispref/ChangeLog 2013-01-05 21:18:01 +0000
@@ -1,3 +1,17 @@
+2013-01-05 Glenn Morris <address@hidden>
+
+ * display.texi (Overlay Properties): Mention field. (Bug#13364)
+
+2013-01-05 Eli Zaretskii <address@hidden>
+
+ * hooks.texi (Standard Hooks): Use @item, not @itemx, as the first
+ directive in a group of items.
+
+2013-01-05 Chong Yidong <address@hidden>
+
+ * keymaps.texi (Key Sequences): Remove obsolete sentence
+ (Bug#13356).
+
2013-01-04 Ari Roponen <address@hidden> (tiny change)
* hash.texi (Defining Hash): Fix typo. (Bug#13345)
=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi 2013-01-02 16:13:04 +0000
+++ b/doc/lispref/display.texi 2013-01-05 21:18:01 +0000
@@ -1559,6 +1559,14 @@
echo area, or in the tooltip window. For details see @ref{Text
help-echo}.
address@hidden field
address@hidden field @r{(overlay property)}
address@hidden Copied from Special Properties.
+Consecutive characters with the same @code{field} property constitute a
address@hidden Some motion functions including @code{forward-word} and
address@hidden stop moving at a field boundary.
address@hidden
+
@item modification-hooks
@kindex modification-hooks @r{(overlay property)}
This property's value is a list of functions to be called if any
=== modified file 'doc/lispref/hooks.texi'
--- a/doc/lispref/hooks.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/hooks.texi 2013-01-05 08:37:05 +0000
@@ -121,7 +121,7 @@
@item delete-terminal-functions
@xref{Multiple Terminals}.
address@hidden pop-up-frame-function
address@hidden pop-up-frame-function
@itemx split-window-preferred-function
@xref{Choosing Window Options}.
=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi 2013-01-02 16:13:04 +0000
+++ b/doc/lispref/keymaps.texi 2013-01-05 21:18:01 +0000
@@ -94,9 +94,6 @@
(kbd "<f1> SPC") @result{} [f1 32]
(kbd "C-M-<down>") @result{} [C-M-down]
@end example
-
-This macro is not meant for use with arguments that vary---only
-with string constants.
@end defun
@node Keymap Basics
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2013-01-04 19:22:37 +0000
+++ b/doc/misc/ChangeLog 2013-01-05 21:18:01 +0000
@@ -1,3 +1,28 @@
+2013-01-05 Andreas Schwab <address@hidden>
+
+ * ada-mode.texi: Remove braces from @title argument.
+ * eudc.texi: Likewise.
+ * smtpmail.texi: Likewise.
+ * auth.texi (VERSION): Set before first use.
+ * emacs-gnutls.texi (VERSION): Likewise.
+ * pgg.texi (VERSION): Likewise.
+ * ede.texi (Top): Rename from top, all uses changed.
+ * eshell.texi: Add missing argument to @sp.
+ * forms.texi (Top): Reorder menu to match structure.
+ * htmlfontify.texi (Customisation): Add missing @item in
+ @enumerate.
+ * org.texi (Advanced features): Add missing argument for @item.
+ (Property searches): Use @backslashchar{} in macro argument.
+ * pcl-cvs.texi: Add missing argument to @sp.
+ (Movement commands): Fix use of @itemx.
+ * vip.texi (Misc Commands, Viewing the Buffer): Likewise.
+ * reftex.texi (Options (Creating Citations)): Add missing newline
+ before @end.
+ * tramp.texi (Obtaining Tramp): Remove extra dots.
+ (Configuration): Reorder menu to match structure.
+ (Remote shell setup): Replace literal NUL character by \0.
+ * viper.texi (Marking): Add missing argument for @item.
+
2013-01-04 Glenn Morris <address@hidden>
* Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS):
=== modified file 'doc/misc/ada-mode.texi'
--- a/doc/misc/ada-mode.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/ada-mode.texi 2013-01-05 21:18:01 +0000
@@ -25,7 +25,7 @@
@titlepage
@sp 10
address@hidden Mode}
address@hidden Ada Mode
@sp 2
@subtitle An Emacs major mode for programming in Ada
@subtitle Ada Mode Version 4.00
=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/auth.texi 2013-01-05 16:19:53 +0000
@@ -2,11 +2,11 @@
@include gnus-overrides.texi
address@hidden VERSION 0.3
+
@setfilename ../../info/auth
@settitle Emacs auth-source Library @value{VERSION}
address@hidden VERSION 0.3
-
@copying
This file describes the Emacs auth-source library.
=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/ede.texi 2013-01-05 16:19:53 +0000
@@ -63,7 +63,7 @@
@contents
address@hidden top, EDE Project Concepts, (dir), (dir)
address@hidden Top, EDE Project Concepts, (dir), (dir)
@top EDE
@comment node-name, next, previous, up
@@ -91,7 +91,7 @@
* GNU Free Documentation License:: The license for this documentation.
@end menu
address@hidden EDE Project Concepts, EDE Mode, top, top
address@hidden EDE Project Concepts, EDE Mode, Top, Top
@chapter @ede{} Project Concepts
@ede{} is a generic interface for managing projects. It specifies a
@@ -126,7 +126,7 @@
documentation or interface files. @ede{} can provide this
information.
address@hidden EDE Mode, Quick Start, EDE Project Concepts, top
address@hidden EDE Mode, Quick Start, EDE Project Concepts, Top
@chapter @ede{} Mode
@ede{} is implemented as a minor mode, which augments other modes such
@@ -143,7 +143,7 @@
commands. These menu items, and their corresponding keybindings, are
independent of the type of project you are actually working on.
address@hidden Quick Start, Creating a project, EDE Mode, top
address@hidden Quick Start, Creating a project, EDE Mode, Top
@chapter Quick Start
Once you have @ede{} enabled, you can create a project. This chapter
@@ -439,7 +439,7 @@
If your program takes command line arguments, you can type them in
when it offers the command line you want to use to run your program.
address@hidden Creating a project, Modifying your project, Quick Start, top
address@hidden Creating a project, Modifying your project, Quick Start, Top
@chapter Creating a project
To create a new project, first visit a file that you want to include
@@ -497,7 +497,7 @@
the toplevel project handles subprojects in the build process is
dependent on that project's type.
address@hidden Modifying your project, Building and Debugging, Creating a
project, top
address@hidden Modifying your project, Building and Debugging, Creating a
project, Top
@chapter Modifying your project
In this chapter, we describe the generic features for manipulating
@@ -678,7 +678,7 @@
To switch between different active configurations, modify the
``configuration default'' slot.
address@hidden Building and Debugging, Miscellaneous commands, Modifying your
project, top
address@hidden Building and Debugging, Miscellaneous commands, Modifying your
project, Top
@chapter Building and Debugging
@ede{} provides the following ``project-aware'' compilation and
@@ -697,7 +697,7 @@
These commands are also available from the @samp{Development} menu.
address@hidden Miscellaneous commands, Extending EDE, Building and Debugging,
top
address@hidden Miscellaneous commands, Extending EDE, Building and Debugging,
Top
@chapter Miscellaneous commands
If you opt to go in and edit @ede{} project files directly---for
@@ -1093,7 +1093,7 @@
methods. See the code in @file{ede-locate.el} for GNU Global as a
simple example.
address@hidden Extending EDE, GNU Free Documentation License, Miscellaneous
commands, top
address@hidden Extending EDE, GNU Free Documentation License, Miscellaneous
commands, Top
@chapter Extending @ede{}
This chapter is intended for users who want to write new parts or fix
=== modified file 'doc/misc/emacs-gnutls.texi'
--- a/doc/misc/emacs-gnutls.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/emacs-gnutls.texi 2013-01-05 16:19:53 +0000
@@ -1,10 +1,10 @@
\input texinfo @c -*-texinfo-*-
address@hidden VERSION 0.3
+
@setfilename ../../info/emacs-gnutls
@settitle Emacs GnuTLS Integration @value{VERSION}
address@hidden VERSION 0.3
-
@copying
This file describes the Emacs GnuTLS integration.
=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/eshell.texi 2013-01-05 21:18:01 +0000
@@ -32,9 +32,9 @@
@sp 4
@c The title is printed in a large font.
@center @titlefont{User's Guide}
address@hidden
address@hidden 1
@center @titlefont{to}
address@hidden
address@hidden 1
@center @titlefont{Eshell: The Emacs Shell}
@ignore
@sp 2
=== modified file 'doc/misc/eudc.texi'
--- a/doc/misc/eudc.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/eudc.texi 2013-01-05 21:18:01 +0000
@@ -35,8 +35,8 @@
@footnotestyle end
@titlepage
address@hidden Manual}
address@hidden Emacs Unified Directory Client}
address@hidden EUDC Manual
address@hidden The Emacs Unified Directory Client
@author by Oscar Figueiredo
@code{1.30b}
=== modified file 'doc/misc/forms.texi'
--- a/doc/misc/forms.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/forms.texi 2013-01-05 16:19:53 +0000
@@ -87,8 +87,8 @@
* Miscellaneous:: Forms mode messages and other remarks.
* Error Messages:: List of error messages forms mode can produce.
* Long Example:: A more complex control file example.
+* Credits:: Thanks everyone.
* GNU Free Documentation License:: The license for this documentation.
-* Credits:: Thanks everyone.
* Index:: Index to this manual.
@end menu
@end ifnottex
=== modified file 'doc/misc/htmlfontify.texi'
--- a/doc/misc/htmlfontify.texi 2013-01-04 09:39:40 +0000
+++ b/doc/misc/htmlfontify.texi 2013-01-05 16:19:53 +0000
@@ -1520,9 +1520,12 @@
in order, to:
@enumerate
- The tag
- The line
- The character (point) at which the tag occurs
address@hidden
+The tag
address@hidden
+The line
address@hidden
+The character (point) at which the tag occurs
@end enumerate
@item hfy-index-file
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/org.texi 2013-01-05 21:18:01 +0000
@@ -3027,7 +3027,7 @@
Selects this line for global recalculation with @kbd{C-u C-c *}, but
not for automatic recalculation. Use this when automatic
recalculation slows down editing too much.
address@hidden
address@hidden @
Unmarked lines are exempt from recalculation with @kbd{C-u C-c *}.
All lines that should be recalculated should be marked with @samp{#}
or @samp{*}.
@@ -5050,7 +5050,7 @@
To create sparse trees and special lists with selection based on properties,
the same commands are used as for tag searches (@pxref{Tag searches}).
@table @kbd
address@hidden / m,C-c \,org-match-sparse-tree}
address@hidden / m,C-c @backslashchar{},org-match-sparse-tree}
Create a sparse tree with all matching entries. With a
@kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
@orgcmd{C-c a m,org-tags-view}
=== modified file 'doc/misc/pcl-cvs.texi'
--- a/doc/misc/pcl-cvs.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/pcl-cvs.texi 2013-01-05 21:18:01 +0000
@@ -31,9 +31,9 @@
@sp 4
@c The title is printed in a large font.
@center @titlefont{User's Guide}
address@hidden
address@hidden 1
@center @titlefont{to}
address@hidden
address@hidden 1
@center @titlefont{PCL-CVS---The Emacs Front-End to CVS}
@ignore
@sp 2
@@ -682,7 +682,7 @@
These keys move the cursor one file forward, towards the end of the
buffer (@code{cvs-mode-next-line})address@hidden
address@hidden p
address@hidden p
This key moves one file backward, towards the beginning of the buffer
(@code{cvs-mode-previous-line}).
@end table
=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/pgg.texi 2013-01-05 16:19:53 +0000
@@ -2,11 +2,11 @@
@include gnus-overrides.texi
address@hidden VERSION 0.1
+
@setfilename ../../info/pgg
@settitle PGG @value{VERSION}
address@hidden VERSION 0.1
-
@copying
This file describes PGG @value{VERSION}, an Emacs interface to various
PGP implementations.
=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/reftex.texi 2013-01-05 21:18:01 +0000
@@ -4611,7 +4611,8 @@
@example
nil @r{Never prompt for optional arguments}
t @r{Always prompt}
-maybe @r{Prompt only if @code{reftex-citation} was called with C-u prefix
address@hidden example
+maybe @r{Prompt only if @code{reftex-citation} was called with C-u prefix
arg}
address@hidden example
Unnecessary empty optional arguments are removed before insertion into
the buffer. See @code{reftex-cite-cleanup-optional-args}.
@end defopt
=== modified file 'doc/misc/smtpmail.texi'
--- a/doc/misc/smtpmail.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/smtpmail.texi 2013-01-05 16:19:53 +0000
@@ -24,9 +24,9 @@
@end direntry
@titlepage
address@hidden SMTP Library}
address@hidden Emacs package for sending mail via SMTP}
address@hidden Josefsson, Alex Schroeder}
address@hidden Emacs SMTP Library
address@hidden An Emacs package for sending mail via SMTP
address@hidden Simon Josefsson, Alex Schroeder
@page
@vskip 0pt plus 1filll
@insertcopying
=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/tramp.texi 2013-01-05 21:18:01 +0000
@@ -374,7 +374,7 @@
@value{tramp}, suitable for installation. But Emacs (22 or later)
includes @value{tramp} already, and there is a @value{tramp} package
for XEmacs, as well. So maybe it is easier to just use those. But if
-you want the bleeding edge, read address@hidden
+you want the bleeding edge, read address@hidden
For the especially brave, @value{tramp} is available from Git. The Git
version is the latest version of the code and may contain incomplete
@@ -515,8 +515,8 @@
* Connection caching:: Reusing connection related information.
* Remote Programs:: How @value{tramp} finds and uses programs on
the remote machine.
* Remote shell setup:: Remote shell setup hints.
+* Auto-save and Backup:: Auto-save and Backup.
* Windows setup hints:: Issues with Cygwin ssh.
-* Auto-save and Backup:: Auto-save and Backup.
@end menu
@@ -1899,7 +1899,7 @@
"passwort" "Passwort"
;; Fran@,{c}ais
"mot de passe" "Mot de passe") t)
- ".*: ? *"))
+ ".*:\0? *"))
@end lisp
In parallel, it might also be necessary to adapt
=== modified file 'doc/misc/vip.texi'
--- a/doc/misc/vip.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/vip.texi 2013-01-05 21:18:01 +0000
@@ -677,9 +677,9 @@
Suspend Emacs.
@item Z Z
Exit Emacs.
address@hidden Q
address@hidden Q
Query replace.
address@hidden R
address@hidden R
Replace.
@end table
@@ -944,11 +944,11 @@
@kindex 002 @kbd{C-b} (@code{vip-scroll-back})
Scroll text of current window downward almost full screen. You can go
@i{backward} in the buffer by this command (@code{vip-scroll-back}).
address@hidden C-d
address@hidden C-d
@kindex 004 @kbd{C-d} (@code{vip-scroll-up})
Scroll text of current window upward half screen. You can go
@i{down} in the buffer by this command (@code{vip-scroll-down}).
address@hidden C-u
address@hidden C-u
@kindex 025 @kbd{C-u} (@code{vip-scroll-down})
Scroll text of current window downward half screen. You can go
@i{up} in the buffer by this command (@code{vip-scroll-up}).
=== modified file 'doc/misc/viper.texi'
--- a/doc/misc/viper.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/viper.texi 2013-01-05 21:18:01 +0000
@@ -3465,7 +3465,7 @@
Exchange point and mark and go to the first CHAR on line.
@item '<a-z>
Go to specified Viper mark.
address@hidden
address@hidden `<a-z>
Go to specified Viper mark and go to the first CHAR on line.
@end table
@kindex @kbd{m<a-z>}
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-01-04 19:22:37 +0000
+++ b/src/ChangeLog 2013-01-05 21:18:01 +0000
@@ -1,3 +1,12 @@
+2013-01-05 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (dump_glyph): Align glyph data better. Use "pD" instead
+ of a non-portable "t" to print ptrdiff_t values. Allow up to 9
+ digits for buffer positions, before misalignment starts. Display
+ "0" for integer "object" field.
+ (dump_glyph_row): Adapt the header line to changes in dump_glyph.
+ Display the newline glyph more unambiguously.
+
2013-01-04 YAMAMOTO Mitsuharu <address@hidden>
* nsterm.m (ns_draw_underwave):
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-01-02 16:13:04 +0000
+++ b/src/xdisp.c 2013-01-05 21:18:01 +0000
@@ -17925,18 +17925,23 @@
void
dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
{
- if (glyph->type == CHAR_GLYPH)
+ if (glyph->type == CHAR_GLYPH
+ || glyph->type == GLYPHLESS_GLYPH)
{
fprintf (stderr,
- " %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+ " %5"pD"d %c %9"pI"d %c %3d 0x%06x %c %4d
%1.1d%1.1d\n",
glyph - row->glyphs[TEXT_AREA],
- 'C',
+ (glyph->type == CHAR_GLYPH
+ ? 'C'
+ : 'G'),
glyph->charpos,
(BUFFERP (glyph->object)
? 'B'
: (STRINGP (glyph->object)
? 'S'
- : '-')),
+ : (INTEGERP (glyph->object)
+ ? '0'
+ : '-'))),
glyph->pixel_width,
glyph->u.ch,
(glyph->u.ch < 0x80 && glyph->u.ch >= ' '
@@ -17949,7 +17954,7 @@
else if (glyph->type == STRETCH_GLYPH)
{
fprintf (stderr,
- " %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+ " %5"pD"d %c %9"pI"d %c %3d 0x%06x %c %4d
%1.1d%1.1d\n",
glyph - row->glyphs[TEXT_AREA],
'S',
glyph->charpos,
@@ -17957,10 +17962,12 @@
? 'B'
: (STRINGP (glyph->object)
? 'S'
- : '-')),
+ : (INTEGERP (glyph->object)
+ ? '0'
+ : '-'))),
glyph->pixel_width,
0,
- '.',
+ ' ',
glyph->face_id,
glyph->left_box_line_p,
glyph->right_box_line_p);
@@ -17968,7 +17975,7 @@
else if (glyph->type == IMAGE_GLYPH)
{
fprintf (stderr,
- " %5td %4c %6"pI"d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+ " %5"pD"d %c %9"pI"d %c %3d 0x%06x %c %4d
%1.1d%1.1d\n",
glyph - row->glyphs[TEXT_AREA],
'I',
glyph->charpos,
@@ -17976,7 +17983,9 @@
? 'B'
: (STRINGP (glyph->object)
? 'S'
- : '-')),
+ : (INTEGERP (glyph->object)
+ ? '0'
+ : '-'))),
glyph->pixel_width,
glyph->u.img_id,
'.',
@@ -17987,7 +17996,7 @@
else if (glyph->type == COMPOSITE_GLYPH)
{
fprintf (stderr,
- " %5td %4c %6"pI"d %c %3d 0x%05x",
+ " %5"pD"d %c %9"pI"d %c %3d 0x%06x",
glyph - row->glyphs[TEXT_AREA],
'+',
glyph->charpos,
@@ -17995,7 +18004,9 @@
? 'B'
: (STRINGP (glyph->object)
? 'S'
- : '-')),
+ : (INTEGERP (glyph->object)
+ ? '0'
+ : '-'))),
glyph->pixel_width,
glyph->u.cmp.id);
if (glyph->u.cmp.automatic)
@@ -18020,10 +18031,10 @@
{
if (glyphs != 1)
{
- fprintf (stderr, "Row Start End Used oE><\\CTZFesm X Y W
H V A P\n");
- fprintf (stderr,
"======================================================================\n");
+ fprintf (stderr, "Row Start End Used oE><\\CTZFesm X Y
W H V A P\n");
+ fprintf (stderr,
"==============================================================================\n");
- fprintf (stderr, "%3d %5"pI"d %5"pI"d %4d %1.1d%1.1d%1.1d%1.1d\
+ fprintf (stderr, "%3d %9"pI"d %9"pI"d %4d %1.1d%1.1d%1.1d%1.1d\
%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n",
vpos,
MATRIX_ROW_START_CHARPOS (row),
@@ -18048,13 +18059,14 @@
row->visible_height,
row->ascent,
row->phys_ascent);
- fprintf (stderr, "%9"pD"d %5"pD"d\t%5d\n",
row->start.overlay_string_index,
+ /* The next 3 lines should align to "Start" in the header. */
+ fprintf (stderr, " %9"pD"d %9"pD"d\t%5d\n",
row->start.overlay_string_index,
row->end.overlay_string_index,
row->continuation_lines_width);
- fprintf (stderr, "%9"pI"d %5"pI"d\n",
+ fprintf (stderr, " %9"pI"d %9"pI"d\n",
CHARPOS (row->start.string_pos),
CHARPOS (row->end.string_pos));
- fprintf (stderr, "%9d %5d\n", row->start.dpvec_index,
+ fprintf (stderr, " %9d %9d\n", row->start.dpvec_index,
row->end.dpvec_index);
}
@@ -18072,7 +18084,7 @@
++glyph_end;
if (glyph < glyph_end)
- fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n");
+ fprintf (stderr, " Glyph# Type Pos O W Code C
Face LR\n");
for (; glyph < glyph_end; ++glyph)
dump_glyph (row, glyph, area);
@@ -18084,15 +18096,24 @@
for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
{
- char *s = alloca (row->used[area] + 1);
+ char *s = alloca (row->used[area] + 4);
int i;
for (i = 0; i < row->used[area]; ++i)
{
struct glyph *glyph = row->glyphs[area] + i;
- if (glyph->type == CHAR_GLYPH
- && glyph->u.ch < 0x80
- && glyph->u.ch >= ' ')
+ if (i == row->used[area] - 1
+ && area == TEXT_AREA
+ && INTEGERP (glyph->object)
+ && glyph->type == CHAR_GLYPH
+ && glyph->u.ch == ' ')
+ {
+ strcpy (&s[i], "[\\n]");
+ i += 4;
+ }
+ else if (glyph->type == CHAR_GLYPH
+ && glyph->u.ch < 0x80
+ && glyph->u.ch >= ' ')
s[i] = glyph->u.ch;
else
s[i] = '.';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111426: Merge from emacs-24; up to r111143,
Glenn Morris <=