Mercurial > emacs
changeset 104927:d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
common doc-string.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 11 Sep 2009 03:34:14 +0000 |
| parents | 71f778b32ef5 |
| children | 5532cc06be89 |
| files | src/ChangeLog src/frame.c |
| diffstat | 2 files changed, 21 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Sep 11 02:28:50 2009 +0000 +++ b/src/ChangeLog Fri Sep 11 03:34:14 2009 +0000 @@ -1,3 +1,8 @@ +2009-09-11 Glenn Morris <rgm@gnu.org> + + * frame.c (Fx_parse_geometry): Unify the X and NS versions so that they + share a common doc-string. + 2009-09-11 Stefan Monnier <monnier@iro.umontreal.ca> * keymap.c (get_keymap): Return the actual keymap symbol rather than
--- a/src/frame.c Fri Sep 11 02:28:50 2009 +0000 +++ b/src/frame.c Fri Sep 11 03:34:14 2009 +0000 @@ -4089,35 +4089,28 @@ -#ifdef HAVE_NS - -/* We used to define x-parse-geometry directly in ns-win.el, but that - confused make-docfile: the documentation string in ns-win.el was - used for x-parse-geometry even in non-NS builds.. */ - +/* NS used to define x-parse-geometry in ns-win.el, but that confused + make-docfile: the documentation string in ns-win.el was used for + x-parse-geometry even in non-NS builds. + + With two definitions of x-parse-geometry in this file, various + things still get confused (eg M-x apropos documentation), so that + it is best if the two definitions just share the same doc-string. +*/ DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0, - doc: /* Parse a Nextstep-style geometry string STRING. + doc: /* Parse a display geometry string STRING. Returns an alist of the form ((top . TOP), (left . LEFT) ... ). The properties returned may include `top', `left', `height', and `width'. -This works by calling `ns-parse-geometry'. */) +For X, the value of `left' or `top' may be an integer, +or a list (+ N) meaning N pixels relative to top/left corner, +or a list (- N) meaning -N pixels relative to bottom/right corner. +On Nextstep, this just calls `ns-parse-geometry'. */) (string) Lisp_Object string; { +#ifdef HAVE_NS call1 (Qns_parse_geometry, string); -} - -#else /* !HAVE_NS */ - -DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0, - doc: /* Parse an X-style geometry string STRING. -Returns an alist of the form ((top . TOP), (left . LEFT) ... ). -The properties returned may include `top', `left', `height', and `width'. -The value of `left' or `top' may be an integer, -or a list (+ N) meaning N pixels relative to top/left corner, -or a list (- N) meaning -N pixels relative to bottom/right corner. */) - (string) - Lisp_Object string; -{ +#else int geometry, x, y; unsigned int width, height; Lisp_Object result; @@ -4159,8 +4152,8 @@ result = Fcons (Fcons (Qheight, make_number (height)), result); return result; +#endif /* HAVE_NS */ } -#endif /* HAVE_NS */ /* Calculate the desired size and position of frame F.