diff options
| author | Joakim Verona <joakim@verona.se> | 2011-12-28 11:34:15 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2011-12-28 11:34:15 +0100 |
| commit | 2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f (patch) | |
| tree | 034e65ef002631d0aba8fc1a41e9984fc557e630 /lisp/man.el | |
| parent | bb29f044aa967831cd664c54eba0de0c701436ce (diff) | |
| parent | d23ab8e8726ecb7e3554644857b4a58e5f7408f1 (diff) | |
| download | emacs-2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f.tar.gz emacs-2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f.tar.bz2 emacs-2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f.zip | |
upstream
Diffstat (limited to 'lisp/man.el')
| -rw-r--r-- | lisp/man.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/man.el b/lisp/man.el index c9ba64bf5e0..3cdbdddb044 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -687,7 +687,7 @@ POS defaults to `point'." ;; Otherwise record the current column and look backwards. (setq column (current-column)) (skip-chars-backward ",; \t") - ;; Record the distance travelled. + ;; Record the distance traveled. (setq distance (- column (current-column))) (when (looking-back (concat "([ \t]*\\(?:" Man-section-regexp "\\)[ \t]*)")) @@ -933,7 +933,8 @@ Return the buffer in which the manpage will appear." ;; minal (using an ioctl(2) if available, the value of ;; $COLUMNS, or falling back to 80 characters if nei- ;; ther is available). - (unless (or (getenv "MANWIDTH") (getenv "COLUMNS")) + (when (or window-system + (not (or (getenv "MANWIDTH") (getenv "COLUMNS")))) ;; This isn't strictly correct, since we don't know how ;; the page will actually be displayed, but it seems ;; reasonable. |