aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Berry2006-07-05 14:13:24 +0000
committerKarl Berry2006-07-05 14:13:24 +0000
commit42b506849af14c640c81fd2b52febb09dbb1f22a (patch)
treefc064926daef6501bd79a5522a3feaae8b41d95a
parent1f1584d4a8b0624b16e44a27f4903544f664a582 (diff)
downloademacs-42b506849af14c640c81fd2b52febb09dbb1f22a.tar.gz
emacs-42b506849af14c640c81fd2b52febb09dbb1f22a.zip
fix overfull/underfull boxes
-rw-r--r--lispref/ChangeLog10
-rw-r--r--lispref/anti.texi2
-rw-r--r--lispref/customize.texi3
-rw-r--r--lispref/display.texi60
-rw-r--r--lispref/internals.texi4
-rw-r--r--lispref/minibuf.texi7
-rw-r--r--lispref/modes.texi7
-rw-r--r--lispref/tips.texi4
8 files changed, 54 insertions, 43 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7a4ed04d66c..0af0b820748 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,13 @@
12006-07-05 Karl Berry <karl@gnu.org>
2
3 * elisp.texi: use @fonttextsize 10pt, a la emacs.texi.
4 and remove @setchapternewpage odd.
5 Result is 1013 pages, down from 1100.
6
7 * anti.texi, customize.texi, display.texi,
8 internals.texi, minibuf.texi, modes.texi tips.texi:
9 fix overfull/underfull boxes.
10
12006-07-05 Thien-Thi Nguyen <ttn@gnu.org> 112006-07-05 Thien-Thi Nguyen <ttn@gnu.org>
2 12
3 * edebug.texi (Instrumenting): 13 * edebug.texi (Instrumenting):
diff --git a/lispref/anti.texi b/lispref/anti.texi
index 6cebff7ece9..78152d7ab31 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -425,7 +425,7 @@ The @code{table} argument to @code{translate-region} can no longer be
425a char-table; it has to be a string. 425a char-table; it has to be a string.
426 426
427@item 427@item
428The functions @code{merge-coding-systems} and 428The two functions @code{merge-coding-systems} and
429@code{decode-coding-inserted-region}, and the variable 429@code{decode-coding-inserted-region}, and the variable
430@code{auto-coding-functions}, have been deleted. The 430@code{auto-coding-functions}, have been deleted. The
431@code{mime-text-unsuitable} coding system property no longer has any 431@code{mime-text-unsuitable} coding system property no longer has any
diff --git a/lispref/customize.texi b/lispref/customize.texi
index 76b1c1a1a93..da2b8a068f9 100644
--- a/lispref/customize.texi
+++ b/lispref/customize.texi
@@ -564,7 +564,8 @@ This is done by using a customization type specification instead of a
564symbol for the key. 564symbol for the key.
565 565
566@smallexample 566@smallexample
567:options '("foo" ((function-item some-function) integer) "baz") 567:options '("foo" ((function-item some-function) integer)
568 "baz")
568@end smallexample 569@end smallexample
569 570
570Many alists use lists with two elements, instead of cons cells. For 571Many alists use lists with two elements, instead of cons cells. For
diff --git a/lispref/display.texi b/lispref/display.texi
index fb4d5678abb..bb0518a0e75 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2889,20 +2889,19 @@ The value of this variable is the default value for
2889@code{fringe-indicator-alist} in buffers that do not override it. 2889@code{fringe-indicator-alist} in buffers that do not override it.
2890@end defvar 2890@end defvar
2891 2891
2892@table @asis 2892Standard fringe bitmaps for indicators:
2893@item Standard fringe bitmaps for indicators: 2893@example
2894@code{left-arrow}, @code{right-arrow}, @code{up-arrow}, @code{down-arrow}, 2894left-arrow right-arrow up-arrow down-arrow
2895@code{left-curly-arrow}, @code{right-curly-arrow}, 2895left-curly-arrow right-curly-arrow
2896@code{left-triangle}, @code{right-triangle}, 2896left-triangle right-triangle
2897@code{top-left-angle}, @code{top-right-angle}, 2897top-left-angle top-right-angle
2898@code{bottom-left-angle}, @code{bottom-right-angle}, 2898bottom-left-angle bottom-right-angle
2899@code{left-bracket}, @code{right-bracket}, 2899left-bracket right-bracket
2900@code{filled-rectangle}, @code{hollow-rectangle}, 2900filled-rectangle hollow-rectangle
2901@code{filled-square}, @code{hollow-square}, 2901filled-square hollow-square
2902@code{vertical-bar}, @code{horizontal-bar}, 2902vertical-bar horizontal-bar
2903@code{empty-line}, 2903empty-line question-mark
2904@code{question-mark}. 2904@end example
2905@end table
2906 2905
2907@node Fringe Cursors 2906@node Fringe Cursors
2908@subsection Fringe Cursors 2907@subsection Fringe Cursors
@@ -2950,12 +2949,11 @@ The value of this variable is the default value for
2950@code{fringe-cursor-alist} in buffers that do not override it. 2949@code{fringe-cursor-alist} in buffers that do not override it.
2951@end defvar 2950@end defvar
2952 2951
2953@table @asis 2952Standard bitmaps for displaying the cursor in right fringe:
2954@item Standard bitmaps for displaying the cursor in right fringe: 2953@example
2955@code{filled-rectangle}, @code{hollow-rectangle}, 2954filled-rectangle hollow-rectangle filled-square hollow-square
2956@code{filled-square}, @code{hollow-square}, 2955vertical-bar horizontal-bar
2957@code{vertical-bar}, @code{horizontal-bar}. 2956@end example
2958@end table
2959 2957
2960 2958
2961@node Fringe Bitmaps 2959@node Fringe Bitmaps
@@ -4117,11 +4115,12 @@ should specify the image as follows:
4117This function returns a suitable search path for images used by the 4115This function returns a suitable search path for images used by the
4118Lisp package @var{library}. 4116Lisp package @var{library}.
4119 4117
4120It searches for @var{image} in @code{image-load-path} (excluding 4118The function searches for @var{image} first in @code{image-load-path}
4121@file{@code{data-directory}/images}) and @code{load-path}, followed by 4119(excluding @file{@code{data-directory}/images}) and then in
4122a path suitable for @var{library}, which includes 4120@code{load-path}, followed by a path suitable for @var{library}, which
4123@file{../../etc/images} and @file{../etc/images} relative to the 4121includes @file{../../etc/images} and @file{../etc/images} relative to
4124library file itself, and then in @file{@code{data-directory}/images}. 4122the library file itself, and finally in
4123@file{@code{data-directory}/images}.
4125 4124
4126Then this function returns a list of directories which contains first 4125Then this function returns a list of directories which contains first
4127the directory in which @var{image} was found, followed by the value of 4126the directory in which @var{image} was found, followed by the value of
@@ -4136,10 +4135,9 @@ Here is an example that uses a common idiom to provide compatibility
4136with versions of Emacs that lack the variable @code{image-load-path}: 4135with versions of Emacs that lack the variable @code{image-load-path}:
4137 4136
4138@example 4137@example
4139;; Shush compiler. 4138(defvar image-load-path) ; shush compiler
4140(defvar image-load-path) 4139(let* ((load-path (image-load-path-for-library
4141 4140 "mh-e" "mh-logo.xpm"))
4142(let* ((load-path (image-load-path-for-library "mh-e" "mh-logo.xpm"))
4143 (image-load-path (cons (car load-path) 4141 (image-load-path (cons (car load-path)
4144 (when (boundp 'image-load-path) 4142 (when (boundp 'image-load-path)
4145 image-load-path)))) 4143 image-load-path))))
@@ -4913,7 +4911,7 @@ design paradigm) by defining commands to modify @code{colorcomp-data}
4913and to ``finish'' the selection process, and a keymap to tie it all 4911and to ``finish'' the selection process, and a keymap to tie it all
4914together conveniently. 4912together conveniently.
4915 4913
4916@example 4914@smallexample
4917(defun colorcomp-mod (index limit delta) 4915(defun colorcomp-mod (index limit delta)
4918 (let ((cur (aref colorcomp-data index))) 4916 (let ((cur (aref colorcomp-data index)))
4919 (unless (= limit cur) 4917 (unless (= limit cur)
@@ -4951,7 +4949,7 @@ The string is formatted #RRGGBB (hash followed by six hex digits)."
4951 (define-key m "." 'colorcomp-B-more) 4949 (define-key m "." 'colorcomp-B-more)
4952 (define-key m " " 'colorcomp-copy-as-kill-and-exit) 4950 (define-key m " " 'colorcomp-copy-as-kill-and-exit)
4953 m)) 4951 m))
4954@end example 4952@end smallexample
4955 4953
4956Note that we never modify the data in each node, which is fixed when the 4954Note that we never modify the data in each node, which is fixed when the
4957ewoc is created to be either @code{nil} or an index into the vector 4955ewoc is created to be either @code{nil} or an index into the vector
diff --git a/lispref/internals.texi b/lispref/internals.texi
index fa96687d1d8..a4ee6223b35 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -505,8 +505,8 @@ appearance.)
505@smallexample 505@smallexample
506@group 506@group
507DEFUN ("or", For, Sor, 0, UNEVALLED, 0, 507DEFUN ("or", For, Sor, 0, UNEVALLED, 0,
508 doc: /* Eval args until one of them yields non-nil, then return that value. 508 doc: /* Eval args until one of them yields non-nil, then return that
509The remaining args are not evalled at all. 509value. The remaining args are not evalled at all.
510If all args return nil, return nil. 510If all args return nil, return nil.
511@end group 511@end group
512@group 512@group
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index 20a049f037b..0fffc8ef923 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -1199,8 +1199,9 @@ Variable name? @point{}
1199If the user then types @kbd{fill-p @key{RET}}, @code{read-variable} 1199If the user then types @kbd{fill-p @key{RET}}, @code{read-variable}
1200returns @code{fill-prefix}. 1200returns @code{fill-prefix}.
1201 1201
1202This function is similar to @code{read-command}, but uses the 1202In general, @code{read-variable} is similar to @code{read-command},
1203predicate @code{user-variable-p} instead of @code{commandp}: 1203but uses the predicate @code{user-variable-p} instead of
1204@code{commandp}:
1204 1205
1205@cindex @code{user-variable-p} example 1206@cindex @code{user-variable-p} example
1206@example 1207@example
@@ -1237,7 +1238,7 @@ value of @var{existing} is neither @code{nil} nor @code{t}, then
1237@var{existing} is @code{nil}, then the name of a nonexistent file is 1238@var{existing} is @code{nil}, then the name of a nonexistent file is
1238acceptable. 1239acceptable.
1239 1240
1240The function @code{read-file-name} uses 1241@code{read-file-name} uses
1241@code{minibuffer-local-filename-completion-map} as the keymap if 1242@code{minibuffer-local-filename-completion-map} as the keymap if
1242@var{existing} is @code{nil}, and uses 1243@var{existing} is @code{nil}, and uses
1243@code{minibuffer-local-must-match-filename-map} if @var{existing} is 1244@code{minibuffer-local-must-match-filename-map} if @var{existing} is
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 7c4896d9532..b2848b87b04 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -502,7 +502,7 @@ the conventions listed above:
502 (let ((st (make-syntax-table))) 502 (let ((st (make-syntax-table)))
503 (modify-syntax-entry ?\" ". " st) 503 (modify-syntax-entry ?\" ". " st)
504 (modify-syntax-entry ?\\ ". " st) 504 (modify-syntax-entry ?\\ ". " st)
505 ;; We add `p' so that M-c on 'hello' leads to 'Hello' rather than 'hello'. 505 ;; Add `p' so M-c on `hello' leads to `Hello', not `hello'.
506 (modify-syntax-entry ?' "w p" st) 506 (modify-syntax-entry ?' "w p" st)
507 st) 507 st)
508 "Syntax table used while in `text-mode'.") 508 "Syntax table used while in `text-mode'.")
@@ -517,8 +517,9 @@ the conventions listed above:
517 (define-key map "\eS" 'center-paragraph) 517 (define-key map "\eS" 'center-paragraph)
518 map) 518 map)
519 "Keymap for `text-mode'. 519 "Keymap for `text-mode'.
520Many other modes, such as `mail-mode', `outline-mode' and `indented-text-mode', 520Many other modes, such as Mail mode, Outline mode
521inherit all the commands defined in this map.") 521and Indented Text mode, inherit all the commands
522defined in this map.")
522@end group 523@end group
523@end smallexample 524@end smallexample
524 525
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 37461398473..6abc41959e7 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -281,8 +281,8 @@ file if you distribute copies. Use a notice like this one:
281 281
282;; You should have received a copy of the GNU General Public 282;; You should have received a copy of the GNU General Public
283;; License along with this program; if not, write to the Free 283;; License along with this program; if not, write to the Free
284;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 284;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
285;; MA 02110-1301 USA 285;; Boston, MA 02110-1301 USA
286@end smallexample 286@end smallexample
287 287
288If you have signed papers to assign the copyright to the Foundation, 288If you have signed papers to assign the copyright to the Foundation,