mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-19 20:30:29 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm@gnu.org

Browse source
This commit is contained in:
Glenn Morris 2014-08-10 17:59:34 -07:00
commit c7367d2de3
20 changed files with 323 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/simple.el
View file

@ -5140,7 +5140,7 @@ or the frame."
0)
0)))
(if (floatp lsp)
(setq lsp (* dfh lsp)))
(setq lsp (truncate (* (frame-char-height) lsp))))
(+ dfh lsp)))
(defun window-screen-lines ()
@ -5152,10 +5152,9 @@ in the window, not in units of the frame's default font, and also accounts
for `line-spacing', if any, defined for the window's buffer or frame.
The value is a floating-point number."
(let ((canonical (window-text-height))
(fch (frame-char-height))
(let ((edges (window-inside-pixel-edges))
(dlh (default-line-height)))
(/ (* (float canonical) fch) dlh)))
(/ (float (- (nth 3 edges) (nth 1 edges))) dlh)))
;; Returns non-nil if partial move was done.
(defun line-move-partial (arg noerror to-end)