X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fauto-show.el;h=ec7ee29e33b813ebb1aaed0965bb3da1bff11afc;hp=9e44467ca119d5f928a946380e377cac45d7a256;hb=414b512c0774e67ba8e160b605447d862d3be166;hpb=a5f466de30a3e927ed1146b0c7e3870e71465c8f diff --git a/lisp/auto-show.el b/lisp/auto-show.el index 9e44467..ec7ee29 100644 --- a/lisp/auto-show.el +++ b/lisp/auto-show.el @@ -92,17 +92,6 @@ visible. Setting this to 0 disables this feature." :type 'number :group 'auto-show) -(defun auto-show-truncationp () - "True if line truncation is enabled for the selected window." - ;; XEmacs change (use specifiers) - ;; ### There should be a more straightforward way to do this from elisp. - (or truncate-lines - (and truncate-partial-width-windows - (< (+ (window-width) - (specifier-instance left-margin-width) - (specifier-instance right-margin-width)) - (frame-width))))) - (defun auto-show-mode (arg) "Turn automatic horizontal scroll mode on or off. With arg, turn auto scrolling on if arg is positive, off otherwise. @@ -128,7 +117,7 @@ This normally includes the horizontal scrollbar commands.") ;; XEmacs addition: (defun auto-show-should-take-action-p () - (and auto-show-mode (auto-show-truncationp) + (and auto-show-mode (window-truncated-p) (equal (window-buffer) (current-buffer)) (not (memq this-command auto-show-inhibiting-commands))))