From 74194465d771110242a989e527000cbb896a6af2 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Dec 2010 19:43:18 -0500 Subject: Doc fix for posn-* functions (Bug#7471). * lisp/subr.el (posn-x-y, posn-object-x-y, posn-object-width-height): Doc fix (Bug#7471). --- lisp/subr.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lisp/subr.el') diff --git a/lisp/subr.el b/lisp/subr.el index 7449295421c..8404352636e 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -916,8 +916,9 @@ Select the corresponding window as well." (defsubst posn-x-y (position) "Return the x and y coordinates in POSITION. -POSITION should be a list of the form returned by the `event-start' -and `event-end' functions." +The return value has the form (X . Y), where X and Y are given in +pixels. POSITION should be a list of the form returned by +`event-start' and `event-end'." (nth 2 position)) (declare-function scroll-bar-scale "scroll-bar" (num-denom whole)) @@ -997,14 +998,15 @@ and `event-end' functions." (defsubst posn-object-x-y (position) "Return the x and y coordinates relative to the object of POSITION. -POSITION should be a list of the form returned by the `event-start' -and `event-end' functions." +The return value has the form (DX . DY), where DX and DY are +given in pixels. POSITION should be a list of the form returned +by `event-start' and `event-end'." (nth 8 position)) (defsubst posn-object-width-height (position) "Return the pixel width and height of the object of POSITION. -POSITION should be a list of the form returned by the `event-start' -and `event-end' functions." +The return value has the form (WIDTH . HEIGHT). POSITION should +be a list of the form returned by `event-start' and `event-end'." (nth 9 position)) -- cgit v1.2.1 From 5612fd086e551a041197520abea15b4912948117 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 Dec 2010 18:34:55 -0800 Subject: Doc fixes. * lisp/subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1) (with-silent-modifications): Doc fixes. --- lisp/subr.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lisp/subr.el') diff --git a/lisp/subr.el b/lisp/subr.el index 8404352636e..c0f65897f29 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1,7 +1,8 @@ ;;; subr.el --- basic lisp subroutines for Emacs ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -418,7 +419,7 @@ Unibyte strings are converted to multibyte for comparison." (assoc-string key alist nil)) (defun member-ignore-case (elt list) - "Like `member', but ignores differences in case and text representation. + "Like `member', but ignore differences in case and text representation. ELT must be a string. Upper-case and lower-case letters are treated as equal. Unibyte strings are converted to multibyte for comparison. Non-strings in LIST are ignored." @@ -1392,9 +1393,8 @@ if it is empty or a duplicate." (defun run-mode-hooks (&rest hooks) "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS. -Execution is delayed if `delay-mode-hooks' is non-nil. -If `delay-mode-hooks' is nil, run `after-change-major-mode-hook' -after running the mode hooks. +Execution is delayed if the variable `delay-mode-hooks' is non-nil. +Otherwise, runs the mode hooks and then `after-change-major-mode-hook'. Major mode functions should use this instead of `run-hooks' when running their FOO-mode-hook." (if delay-mode-hooks @@ -2495,7 +2495,7 @@ If PARAM is present and non-nil, it replaces STRING as the object `yank-rectangle', PARAM may be a list of strings to insert as a rectangle. If NOEXCLUDE is present and non-nil, the normal removal of the - yank-excluded-properties is not performed; instead FUNCTION is + `yank-excluded-properties' is not performed; instead FUNCTION is responsible for removing those properties. This may be necessary if FUNCTION adjusts point before or after inserting the object. If UNDO is present and non-nil, it is a function that will be called @@ -2767,7 +2767,7 @@ See also `with-temp-file' and `with-output-to-string'." (kill-buffer ,temp-buffer))))))) (defmacro with-silent-modifications (&rest body) - "Execute BODY, pretending it does not modifies the buffer. + "Execute BODY, pretending it does not modify the buffer. If BODY performs real modifications to the buffer's text, other than cosmetic ones, undo data may become corrupted. Typically used around modifications of text-properties which do not really @@ -3778,9 +3778,9 @@ which is higher than \"1alpha\"." ;; The following statement ought to be in print.c, but `provide' can't ;; be used there. +;; http://lists.gnu.org/archive/html/emacs-devel/2009-08/msg00236.html (when (hash-table-p (car (read-from-string (prin1-to-string (make-hash-table))))) (provide 'hashtable-print-readable)) -;; arch-tag: f7e0e6e5-70aa-4897-ae72-7a3511ec40bc ;;; subr.el ends here -- cgit v1.2.1 From 11aad4e9f9f54ce8e9ecc66347e512b20a3cdf39 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Dec 2010 22:45:57 +0200 Subject: subr.el (posn-col-row): Evaluate header-line-format in the context of the POSITION window's buffer. --- lisp/subr.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lisp/subr.el') diff --git a/lisp/subr.el b/lisp/subr.el index c0f65897f29..e4be7df50c7 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -958,7 +958,9 @@ and `event-end' functions." (setq spacing 0))) (cons (/ (car pair) (frame-char-width frame)) (- (/ (cdr pair) (+ (frame-char-height frame) spacing)) - (if (null header-line-format) 0 1)))))))) + (if (null (with-current-buffer (window-buffer window) + header-line-format)) + 0 1)))))))) (defun posn-actual-col-row (position) "Return the actual column and row in POSITION, measured in characters. -- cgit v1.2.1