* window.c (window_internal_width): New function, which accounts
for scrollbars if present.
* lisp.h (window_internal_height, window_internal_width): Add
extern declarations for these.
* dispnew.c (direct_output_for_insert, direct_output_forward_char,
buffer_posn_from_coords): Use window_internal_width instead of
writing out its definition.
* indent.c (compute_motion): Doc fix; mention scrollbars and
window_internal_width.
(pos_tab_offset, Fvertical_motion): Use window_internal_width
instead of writing it out.
* window.c (Fpos_visible_in_window_p, Fwindow_width, Fscroll_left,
Fscroll_right): Same.
* xdisp.c (redisplay, try_window, try_window_id,
display_text_line): Same.
* xdisp.c (display_string): Add new variable `f', to be W's
frame. Use it to set desired_glyphs, and to get the frame's width
to decide whether or not to draw vertical bars.
* xdisp.c (display_text_line): If we're using vertical scrollbars,
don't draw the vertical bars separating side-by-side windows.
(display_string): Same thing. Draw spaces to fill in the part of
the mode line that is under the scrollbar in partial-width
windows.
* xdisp.c (display_text_line): Use the usable internal width of
the window, as calculated above, as the limit on the length of the
overlay arrow's image, rather than using the window's width field,
less one.
* xdisp.c (redisplay): Call condemn_scrollbars_hook and
judge_scrollbars_hook whenever they are set, not just when the
frame has vertical scrollbars.
* termhooks.h (mouse_position_hook): Doc fix.
(set_vertical_scrollbar_hook): This doesn't return anything any
more, and doesn't take a struct scrollbar * argument any more.
(condemn_scrollbars_hook, redeem_scrollbar_hook,
judge_scrollbars_hook): Doc fixes.
* term.c (mouse_position_hook): Doc fix.
(set_vertical_scrollbar_hook): This doesn't return
anything any more. Doc fixes.
* keyboard.c (kbd_buffer_get_event): Receive the scrollbar's
window from *mouse_position_hook and pass it to
make_lispy_movement, instead of working with a pointer to a struct
scrollbar.
(make_lispy_event): We don't need a window_from_scrollbar function
anymore; we are given the window directly in *EVENT.
Unify the code which generates
text-area mouse clicks and scrollbar clicks; use the same code to
distinguish clicks from drags on the scrollbar as in the text area.
Distinguish clicks from drags by storing a copy of the lispy
position list returned as part of the event.
(button_down_location): Make this a lisp vector, rather than an
array of random structures.
(struct mouse_position): Remove this; it's been replaced by a lisp
list.
(make_lispy_movement): Accept the scrollbar's window as a
parameter, rather than the scrollbar itself.
If FRAME is zero, assume that the other arguments are garbage.
(syms_of_keyboard): No need to staticpro each window of
button_down_location now; just initialize and staticpro it.
* window.c (window_from_scrollbar): Function deleted; no longer
needed.
* xdisp.c (redisplay_window): Just pass the window to
set_vertical_scrollbar hook; don't pass the scrollbar object too.
* xterm.c (XTmouse_position): Don't return a pointer to the
scrollbar for scrollbar motion; instead, return the scrollbar's
window.
* xdisp.c (echo_area_display): Move the assignment of f and the
check for visibility out of the "#ifdef MULTI_FRAME" clause; they
should work under any circumstances.
* xdisp.c (redisplay_window): If we're not going to redisplay this
window because it's a minibuffer whose contents have already been
updated, go ahead and jump to the scrollbar refreshing code
anyway; they still need to be updated. Initialize opoint, so it's
known to be valid when we jump. Calculate the scrollbar settings
properly for minibuffers, no matter what they are displaying at
the time.
* xdisp.c (redisplay_windows): Don't restore the current buffer
and its point before refreshing the scrollbars; we need the buffer
accurate.
;;; indent.el --- indentation commands for Emacs;; Copyright (C) 1985 Free Software Foundation, Inc.;; Maintainer: FSF;; This file is part of GNU Emacs.;; GNU Emacs is free software; you can redistribute it and/or modify;; it under the terms of the GNU General Public License as published by;; the Free Software Foundation; either version 2, or (at your option);; any later version.;; GNU Emacs is distributed in the hope that it will be useful,;; but WITHOUT ANY WARRANTY; without even the implied warranty of;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the;; GNU General Public License for more details.;; You should have received a copy of the GNU General Public License;; along with GNU Emacs; see the file COPYING. If not, write to;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.;;; Code:(defvar indent-line-function 'indent-to-left-margin "\Function to indent current line.");Now in loaddefs.el(defun indent-according-to-mode () "Indent line in proper way for current major mode." (interactive) (funcall indent-line-function))(defun indent-for-tab-command () "Indent line in proper way for current major mode." (interactive) (if (eq indent-line-function 'indent-to-left-margin) (insert-tab) (funcall indent-line-function)))(defun insert-tab () (if abbrev-mode (expand-abbrev)) (if indent-tabs-mode (insert ?\t) (indent-to (* tab-width (1+ (/ (current-column) tab-width))))))(defun indent-rigidly (start end arg) "Indent all lines starting in the region sideways by ARG columns.Called from a program, takes three arguments, START, END and ARG." (interactive "r\np") (save-excursion (goto-char end) (setq end (point-marker)) (goto-char start) (or (bolp) (forward-line 1)) (while (< (point) end) (let ((indent (current-indentation))) (delete-region (point) (progn (skip-chars-forward " \t") (point))) (or (eolp) (indent-to (max 0 (+ indent arg)) 0))) (forward-line 1)) (move-marker end nil)));; This is the default indent-line-function,;; used in Fundamental Mode, Text Mode, etc.(defun indent-to-left-margin () (or (= (current-indentation) left-margin) (let (epos) (save-excursion (beginning-of-line) (delete-region (point) (progn (skip-chars-forward " \t") (point))) (indent-to left-margin) (setq epos (point))) (if (< (point) epos) (goto-char epos)))))(defvar indent-region-function nil "Function which is short cut to indent each line in region with TAB.A value of nil means really perform TAB on each line.")(defun indent-region (start end arg) "Indent each nonblank line in the region.With no argument, indent each line with TAB.\(If there is a fill prefix, make each line start with the fill prefix.)With argument COLUMN, indent each line to that column.Called from a program, takes three args: START, END and COLUMN." (interactive "r\nP") (if (null arg) (if fill-prefix (save-excursion (goto-char end) (setq end (point-marker)) (goto-char start) (let ((regexp (regexp-quote fill-prefix))) (while (< (point) end) (or (looking-at regexp) (insert fill-prefix)) (forward-line 1)))) (if indent-region-function (funcall indent-region-function start end) (save-excursion (goto-char end) (setq end (point-marker)) (goto-char start) (or (bolp) (forward-line 1)) (while (< (point) end) (funcall indent-line-function) (forward-line 1)) (move-marker end nil)))) (setq arg (prefix-numeric-value arg)) (save-excursion (goto-char end) (setq end (point-marker)) (goto-char start) (or (bolp) (forward-line 1)) (while (< (point) end) (delete-region (point) (progn (skip-chars-forward " \t") (point))) (or (eolp) (indent-to arg 0)) (forward-line 1)) (move-marker end nil))))(defun indent-relative-maybe () "Indent a new line like previous nonblank line." (interactive) (indent-relative t))(defun indent-relative (&optional unindented-ok) "Space out to under next indent point in previous nonblank line.An indent point is a non-whitespace character following whitespace.If the previous nonblank line has no indent points beyond thecolumn point starts at, `tab-to-tab-stop' is done instead." (interactive "P") (if abbrev-mode (expand-abbrev)) (let ((start-column (current-column)) indent) (save-excursion (beginning-of-line) (if (re-search-backward "^[^\n]" nil t) (let ((end (save-excursion (forward-line 1) (point)))) (move-to-column start-column) ;; Is start-column inside a tab on this line? (if (> (current-column) start-column) (backward-char 1)) (or (looking-at "[ \t]") unindented-ok (skip-chars-forward "^ \t" end)) (skip-chars-forward " \t" end) (or (= (point) end) (setq indent (current-column)))))) (if indent (let ((opoint (point-marker))) (delete-region (point) (progn (skip-chars-backward " \t") (point))) (indent-to indent 0) (if (> opoint (point)) (goto-char opoint)) (move-marker opoint nil)) (tab-to-tab-stop))))(defvar tab-stop-list '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120) "*List of tab stop positions used by `tab-to-tab-stops'.")(defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.")(if edit-tab-stops-map nil (setq edit-tab-stops-map (make-sparse-keymap)) (define-key edit-tab-stops-map "\C-x\C-s" 'edit-tab-stops-note-changes) (define-key edit-tab-stops-map "\C-c\C-c" 'edit-tab-stops-note-changes))(defvar edit-tab-stops-buffer nil "Buffer whose tab stops are being edited--in casethe variable `tab-stop-list' is local in that buffer.")(defun edit-tab-stops () "Edit the tab stops used by `tab-to-tab-stop'.Creates a buffer *Tab Stops* containing text describing the tab stops.A colon indicates a column where there is a tab stop.You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes] to make changes take effect." (interactive) (setq edit-tab-stops-buffer (current-buffer)) (switch-to-buffer (get-buffer-create "*Tab Stops*")) (use-local-map edit-tab-stops-map) (make-local-variable 'indent-tabs-mode) (setq indent-tabs-mode nil) (overwrite-mode 1) (setq truncate-lines t) (erase-buffer) (let ((tabs tab-stop-list)) (while tabs (indent-to (car tabs) 0) (insert ?:) (setq tabs (cdr tabs)))) (let ((count 0)) (insert ?\n) (while (< count 8) (insert (+ count ?0)) (insert " ") (setq count (1+ count))) (insert ?\n) (while (> count 0) (insert "0123456789") (setq count (1- count)))) (insert "\nTo install changes, type C-c C-c") (goto-char (point-min)))(defun edit-tab-stops-note-changes () "Put edited tab stops into effect." (interactive) (let (tabs) (save-excursion (goto-char 1) (end-of-line) (while (search-backward ":" nil t) (setq tabs (cons (current-column) tabs)))) (bury-buffer (prog1 (current-buffer) (switch-to-buffer edit-tab-stops-buffer))) (setq tab-stop-list tabs)) (message "Tab stops installed"))(defun tab-to-tab-stop () "Insert spaces or tabs to next defined tab-stop column.The variable `tab-stop-list' is a list of columns at which there are tab stops.Use \\[edit-tab-stops] to edit them interactively." (interactive) (if abbrev-mode (expand-abbrev)) (let ((tabs tab-stop-list)) (while (and tabs (>= (current-column) (car tabs))) (setq tabs (cdr tabs))) (if tabs (indent-to (car tabs)) (insert ?\ ))))(defun move-to-tab-stop () "Move point to next defined tab-stop column.The variable `tab-stop-list' is a list of columns at which there are tab stops.Use \\[edit-tab-stops] to edit them interactively." (interactive) (let ((tabs tab-stop-list)) (while (and tabs (>= (current-column) (car tabs))) (setq tabs (cdr tabs))) (if tabs (move-to-column (car tabs) t))))(define-key global-map "\t" 'indent-for-tab-command)(define-key esc-map "\034" 'indent-region)(define-key ctl-x-map "\t" 'indent-rigidly)(define-key esc-map "i" 'tab-to-tab-stop);;; indent.el ends here
