summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-06-10 20:22:10 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-06-10 20:22:10 +0000
commit2a3bd2e19336d9a83349575859cfb4842c2ec861 (patch)
tree99185c9d37c39d003f8b6395e03aa9c866be64f3 /lisp/cus-start.el
parentd5dc61631e773495e96ed2bbd3bca16c981e9f7e (diff)
* xdisp.c (underline_minimum_offset): Rename from xterm.c's
x_underline_minimum_display_offset. (syms_of_xdisp): Declare it here rather than in xterm.c. * dispextern.h (underline_minimum_offset): Declare it. * w32term.c (x_draw_glyph_string): Use it. * xterm.c (x_underline_minimum_display_offset): Move to xdisp.c. (syms_of_xterm): Don't declare it any more. (x_draw_glyph_string): Adjust to the new name. * cus-start.el (underline-minimum-offset) Rename from x-underline-minimum-display-offset.
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 73150ce8f7c..302d6689186 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -331,6 +331,7 @@ since it could result in memory overflow and make Emacs crash."
(unibyte-display-via-language-environment mule boolean)
(blink-cursor-alist cursor alist "22.1")
(overline-margin display integer "22.1")
+ (underline-minimum-offset display integer "23.1")
(mouse-autoselect-window
display (choice
(const :tag "Off (nil)" :value nil)
@@ -348,7 +349,6 @@ since it could result in memory overflow and make Emacs crash."
;; xterm.c
(x-use-underline-position-properties display boolean "22.1")
(x-underline-at-descent-line display boolean "22.1")
- (x-underline-minimum-display-offset display integer "23.1")
(x-stretch-cursor display boolean "21.1")))
this symbol group type standard version native-p
;; This function turns a value