*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index c1031ecd97046c43b91fa77149975c8559d8a914..88829953fedcef2c7d022a8dd1f7bc69d5da73bb 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,6 +16,21 @@ images and toolkit scrollbars.  Use the --help option to list them.
 \f
 * Changes in Emacs 21.1
 
+** On window-systems, additional space can be put between text lines
+on the display using several methods
+
+- By setting frame parameter `line-spacing' to PIXELS.  PIXELS must be
+a positive integer, and specifies that PIXELS number of pixels should
+be put below text lines on the affected frame or frames.
+
+- By setting X resource `lineSpacing', class `LineSpacing'.  This is
+equivalent ot specifying the frame parameter.
+
+- By specifying `--line-spaceing=N' or `-lsp N' on the command line.
+
+- By setting buffer-local variable `line-spacing'.  The meaning is
+the same, but applies to the a particular buffer only.
+
 ** The new command `clone-buffer-indirectly' can be used to create
 an indirect buffer that is a twin copy of the current buffer.  The
 command `clone-buffer-indirectly-other-window', bound to C-x 4 c,
@@ -315,7 +330,9 @@ LessTif and Motif.
 
 ** Hscrolling in C code.
 
-Horizontal scrolling now happens automatically.
+Horizontal scrolling now happens automatically if
+`automatic-hscrolling' is set (the default).  This setting can be
+customized.
 
 ** Tool bar support.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6337e6f78ffd4206d591ed274e7a8a25615c7e16..7f63eda9cfee08f42c84d0c240cbd1f9eadbbeaf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-24  Gerd Moellmann  <gerd@gnu.org>
+
+       * frame.el (scrolling): New group.
+       (automatic-hscrolling): New user-option.
+
+       * startup.el (command-line-x-option-alist): Add `-lsp' and
+       `--line-spacing'.
+
 2000-04-19  Dave Love  <fx@gnu.org>
 
        * emacs-lisp/cl-extra.el (cl-old-mapc): Fix definition.

diff --git a/lisp/cus-load.el b/lisp/cus-load.el
index df9b657c8a22337c7ecf3b5e7e282538c8a3d1c3..b3b04240af2c101d846723de523c7f89fa35e687 100644 (file)
--- a/lisp/cus-load.el
+++ b/lisp/cus-load.el
@@ -400,6 +400,7 @@
 (put 'gnus-article-saving 'custom-loads '("gnus-art"))
 (put 'icomplete 'custom-loads '("icomplete"))
 (put 'LaTeX 'custom-loads '("reftex-vars"))
+(put 'scrolling 'custom-loads '("frame"))
 (put 'man 'custom-loads '("man"))
 (put 'solitaire 'custom-loads '("solitaire"))
 (put 'hippie-expand 'custom-loads '("hippie-exp"))
@@ -611,6 +612,8 @@
 (custom-put-if-not 'change-log-version-info-enabled 'standard-value t)
 (custom-put-if-not 'midnight 'custom-version "20.3")
 (custom-put-if-not 'midnight 'group-documentation "Run something every day at midnight.")
+(custom-put-if-not 'automatic-hscrolling 'custom-version "21.1")
+(custom-put-if-not 'automatic-hscrolling 'standard-value t)
 (custom-put-if-not 'custom-buffer-done-function 'custom-version "21.1")
 (custom-put-if-not 'custom-buffer-done-function 'standard-value t)
 (custom-put-if-not 'tags-apropos-additional-actions 'custom-version "21.1")
@@ -689,6 +692,8 @@
 (custom-put-if-not 'checkdoc 'group-documentation "Support for doc string checking in Emacs Lisp.")
 (custom-put-if-not 'mail-abbrevs-mode 'custom-version "20.3")
 (custom-put-if-not 'mail-abbrevs-mode 'standard-value t)
+(custom-put-if-not 'scrolling 'custom-version "21.1")
+(custom-put-if-not 'scrolling 'group-documentation "Scrolling windows.")
 (custom-put-if-not 'sh-imenu-generic-expression 'custom-version "20.4")
 (custom-put-if-not 'sh-imenu-generic-expression 'standard-value t)
 (custom-put-if-not 'temp-buffer-max-height 'custom-version "20.4")
@@ -752,7 +757,7 @@
 (custom-put-if-not 'eval-expression-print-level 'custom-version "21.1")
 (custom-put-if-not 'eval-expression-print-level 'standard-value t)
 
-(defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "sh-script" "help" "compile") ("21.1" "debug" "dabbrev" "paths" "sgml-mode" "fortran" "etags" "cus-edit" "add-log" "find-func" "simple") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "vc-hooks" "cus-edit" "replace"))
+(defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "sh-script" "help" "compile") ("21.1" "debug" "dabbrev" "paths" "sgml-mode" "fortran" "etags" "cus-edit" "frame" "add-log" "find-func" "simple") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "vc-hooks" "cus-edit" "replace"))
  "For internal use by custom.")
 
 (provide 'cus-load)

diff --git a/src/ChangeLog b/src/ChangeLog
index b04c003a479ffe12d133821c7ecf08f5762074ca..dfd2a897790e968bf0d906e8d459cdda61ca35e5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2000-04-24  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (init_iterator): Set iterator's extra_line_spacing
+       from buffer or frame.
+       (automatic_hscrolling_p): New variable.
+       (hscroll_windows): Scroll windows horizontally only if automatic
+       hscrolling is allowed.
+       (syms_of_xdisp): New variable `automatic-hscrolling'.
+
+       * frame.h (struct frame): Add member extra_line_spacing.
+
+       * xfns.c (x_set_line_spacing): New function.
+       (Fx_create_frame): Set line spacing from resources.
+       (Qline_spacing): New variable.
+       (syms_of_xfns): Initialize Qline_spacing.
+       
+       * emacs.c (USAGE2): Add `--line-spacing' and `-lsp'.
+
+       * buffer.c (init_buffer_once): Handle extra_line_spacing.
+       (syms_of_buffer): Add `default-line-spacing' and `line-spacing'.
+       (reset_buffer): Don't initialize extra2 and extra3.  Intialize
+       extra_line_spacing from default value.
+       (init_buffer_once): Initialize default value of extra_line_spacing.
+
+       * buffer.h (struct buffer): Add extra_line_spacing, remove extra2
+       and extra3.
+
+       * xterm.c (x_produce_glyphs): Remove reference to struct it's
+       prompt_width.  Add extra line spacing.
+
+       * term.c (produce_glyphs): Remove reference to struct it's
+       prompt_width.
+
+       * dispextern.h (struct it): Remove member prompt_width, add
+       extra_line_spacing.
+
 2000-04-22  Gerd Moellmann  <gerd@gnu.org>
 
        * dispnew.c (update_frame_line): When writing a whole line, make