Commit graph

536 commits

Author SHA1 Message Date
Jan Djärv
3928f2b67e Use *font for Xft font names for Lucid menus and dialogs.
* doc/emacs/xresources.texi (X Resources): Remove *faceName and replace it with
*font for Lucid.

* lwlib/lwlib-Xaw.c (make_dialog): Use *font even for Xft fonts.  Try
XLoadQueryFont first and then Xft fonts.

* lwlib/xlwmenu.c (xlwmenu_default_font): Remove, does not work for
multi-display.
(xlwMenuResources): Remove XtNfaceName and XtNdefaultFace.
Make XtNFont a String resource.
(make_windows_if_needed): Call XFlush so later changes are seen by the
X server.
(remap_menubar): Use XtMoveWidget and then
XtResizeWidget/XtResizeWindow after XtPopup.  Works better with
Compiz.
(make_drawing_gcs): Check if mw->menu.font is set.
(getDefaultXftFont): New function.
(openXftFont): faceName is now fontName.  Try XLoadQueryFont first
and then XftFontOpenName.
(XlwMenuInitialize): Initialize mw->menu.font with XLoadQueryFont.
(XlwMenuClassInitialize): Remove initialization of
xlwmenu_default_font.
(fontname_changed): Renamed from facename_changed.
(XlwMenuSetValues): Use facename_changed.

* lwlib/xlwmenu.h: Remove Xt[CN]faceName and Xt[NC]defaultFace.

* lwlib/xlwmenuP.h (_XlwMenu_part): Remove faceName.  Add fontName.

* src/xmenu.c (apply_systemfont_to_dialog): Apply to *dialog.font.
(apply_systemfont_to_menu): Set resources *menubar*font and
*popup*font.  Remove defflt.
(set_frame_menubar, create_and_show_popup_menu): Call
apply_systemfont_to_menu before lw_create_widget.

* src/xrdb.c (x_load_resources): For LUCID and XFT, don't put a
resource that specifies helvetica for menus and dialogs.
2011-02-14 18:21:10 +01:00
Glenn Morris
233ba4d924 Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca. 2011-02-05 14:30:14 -08:00
Chong Yidong
a41c866068 Last remaining doc additions required by 23.3.
* doc/emacs/maintaining.texi (VC Change Log): Document vc-log-incoming and
vc-log-outgoing.
(Merging): Document vc-find-conflicted-file.

* doc/emacs/rmail.texi (Rmail Display): Document Rmail MIME support more
accurately.

* doc/lispref/commands.texi (Accessing Mouse): Note that a header line is not
included in the row of posn-col-row.

* etc/NEWS: Remove +++ and --- lines.
2011-02-05 01:13:36 -05:00
Glenn Morris
d436de979a * doc/emacs/custom.texi (Variables): Fix typo. 2011-02-03 19:17:58 -08:00
Chong Yidong
14beddf471 Merge changes from emacs-23 branch 2011-01-31 18:54:50 -05:00
Eli Zaretskii
bf3dae7ec3 Fix doc/*/makefile.w32-in according to 2011-01-23T10:22:21Z!wl@gnu.org-2011-01-23T10:38:14Z!wl@gnu.org.
doc/lispref/makefile.w32-in (texinfodir): New variable.
 (usermanualdir): Remove as redundant with $(emacsdir).
 (MAKEINFO): Remove options, leave only program name.
 (MAKEINFO_OPTS): New variable.
 (texinputdir, $(infodir)/elisp): Use $(MAKEINFO_OPTS).
 doc/emacs/makefile.w32-in (MAKEINFO): Remove options, leave only program name.
 (MAKEINFO_OPTS): New variable.
 (ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
 (emacs.html): New target.
 (clean): Remove emacs.html.
 doc/misc/makefile.w32-in (MAKEINFO): Remove options, leave only program name.
 (MAKEINFO_OPTS): New variable.
 (ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
 ($(infodir)/info, $(infodir)/ccmode, $(infodir)/ada-mode)
 ($(infodir)/pcl-cvs, $(infodir)/eshell, $(infodir)/cl)
 ($(infodir)/dbus, $(infodir)/dired-x, $(infodir)/ediff)
 ($(infodir)/flymake, $(infodir)/forms, $(infodir)/gnus)
 ($(infodir)/message, $(infodir)/emacs-mime, $(infodir)/sieve)
 ($(infodir)/pgg, $(infodir)/mh-e, $(infodir)/reftex)
 ($(infodir)/remember, $(infodir)/sasl, $(infodir)/sc)
 ($(infodir)/vip, $(infodir)/viper, $(infodir)/widget)
 ($(infodir)/efaq, $(infodir)/autotype, $(infodir)/calc)
 ($(infodir)/idlwave, $(infodir)/eudc, $(infodir)/ebrowse)
 ($(infodir)/woman, $(infodir)/speedbar, $(infodir)/tramp)
 ($(infodir)/ses, $(infodir)/smtpmail, $(infodir)/org)
 ($(infodir)/url, $(infodir)/newsticker, $(infodir)/nxml-mode)
 ($(infodir)/rcirc, $(infodir)/erc, $(infodir)/ert)
 ($(infodir)/epa, $(infodir)/mairix-el, $(infodir)/auth)
 ($(infodir)/eieio, $(infodir)/ede, $(infodir)/semantic)
 ($(infodir)/edt): Use $(MAKEINFO_OPTS).
2011-01-29 16:48:19 +02:00
Chong Yidong
65401ee3fe * search.texi (Regexps): Copyedits. Mention character classes (Bug#7809). 2011-01-28 13:03:30 -05:00
Chong Yidong
19f81ecfde Remove text on directory-abbrev-alist omitted in 2011-01-08 commit.
* files.texi (File Aliases): Restore explanatory text from Eli
Zaretskii, accidentally removed in 2011-01-08 commit.
2011-01-28 12:29:30 -05:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Werner LEMBERG
45eb2a5d46 Improve configuration of makeinfo.
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable.  Use it where appropriate.
(ENVADD): Updated.
2011-01-23 11:38:14 +01:00
Glenn Morris
9acfe7034c Small updates for manual Ack section.
* doc/emacs/ack.texi, doc/emacs/emacs.texi (Acknowledgments):
Update for ERT addition.

* doc/emacs/ack.texi (Acknowledgments): Remove mention of replaced prolog.el.
2011-01-18 00:22:22 -08:00
Glenn Morris
d52969e8af Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.
Note:
emacs-23 2010-05-20T01:32:08Z!lekktu@gmail.com is rendered unnecessary by pre-existing 2010-05-20
trunk change.
2011-01-15 12:38:27 -08:00
Glenn Morris
362b9d483c Merge from emacs-23 branch. 2011-01-15 12:03:38 -08:00
Chong Yidong
bb033b5f61 * building.texi (Compilation): Improve instructions for running two compilations (Bug#7573). 2011-01-14 22:10:38 -05:00
Mark Diekhans
b024d9f02d Make last-resort backup file in .emacs.d (Bug#6953).
* lisp/files.el (backup-buffer): Make last-resort backup file in
.emacs.d.

* lisp/subr.el (locate-user-emacs-file): If .emacs.d does not exist,
make it with permission 700.

* doc/emacs/files.texi (Backup Names): Document the new location of the
last-resort backup file.
2011-01-14 21:32:19 -05:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Chong Yidong
c40b51e0ff Move directory-abbrev-alist doc from Lispref to Emacs manual.
* doc/emacs/files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp
manual.  Explain why directory-abbrev-alist elements should be anchored
(Bug#7777).

* doc/lispref/files.texi (Directory Names): Move directory-abbrev-alist doc to
Emacs manual.
2011-01-08 17:01:13 -05:00
Eli Zaretskii
c1f04bcf73 Fix description of emacsclientw.exe.
msdog.texi (Windows Startup): Correct inaccurate description of
 differences between emacsclient.exe and emacsclientw.exe.
2011-01-07 17:32:12 +02:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Chong Yidong
7c420169ba Merge changes from emacs-23 branch 2011-01-02 15:31:19 -05:00
Tassilo Horn
92bb6c52b7 * misc.texi (Document View): Update DocView section with newly
supported document formats.
2010-12-30 21:23:13 +01:00
Chong Yidong
89dc29d9c8 * rmail.texi (Rmail Display): Edit for grammar and conciseness. 2010-12-30 20:39:41 +08:00
Kenichi Handa
7f42ff40b1 rmail.texi (Rmail Display): Describe new features of Rmail in Info. 2010-12-27 20:03:58 +09:00
Eli Zaretskii
2d34d52373 Fix bug #7702 with docs of selections wrt MS-Windows.
doc/emacs/frames.texi (Cut and Paste): Modify the section's name and text:
 don't mix "cut/paste" with "kill/yank".
 (Cut/Paste Other App): Describe the per-session emulation of PRIMARY.
 lisp/simple.el (select-active-regions): Doc fix.
2010-12-25 13:34:45 +02:00
Eli Zaretskii
88ab43400d Fix bug #7667: mention debug-on-quit in the manual.
trouble.texi (Checklist): Mention debug-on-quit.
2010-12-25 12:35:16 +02:00
Chong Yidong
b103c904d9 Resection the Killing chapter in the Emacs manual.
* killing.texi: Resection the Info version to conform to the
printed manual, to avoid making sections on Accumulating Text, CUA
and Rectangles into full chapters.
2010-12-21 15:54:27 +08:00
Glenn Morris
d3658de737 Minor doc fix for manual; bug#7674
* doc/emacs/maintaining.texi: Move inclusion of emerge after EDE, so
that it matches its position in the menu.
2010-12-18 13:28:51 -08:00
Glenn Morris
da3930f31c * doc/emacs/trouble.texi (Checklist): Mention not replying via news either. 2010-12-13 20:22:49 -08:00
Glenn Morris
e6df29f90e ChangeLog merge fix. 2010-12-13 09:18:55 -08:00
Stefan Monnier
f49d1f52b2 Merge from emacs-23 2010-12-13 10:27:36 -05:00
Eli Zaretskii
68f75971cc Fix bug #7576 with lack of index entries for character syntax.
custom.texi (Init Syntax): Add index entries for "character syntax".
2010-12-11 11:11:32 +02:00
Karel Klíc
6e427e9670 * doc/emacs/text.texi (HTML Mode): Small fixes.
Fixes: debbugs:7607
2010-12-10 18:37:16 -08:00
Glenn Morris
ffda048bfb * doc/emacs/trouble.texi (Checklist): Fix typo in newsgroup name. 2010-12-09 19:33:51 -08:00
Chong Yidong
2931c841a3 Document behavior of lazy highlight in word search (Bug#7470).
* doc/emacs/search.texi (Word Search): Note that the lazy highlight
always matches to whole words (Bug#7470).
2010-12-04 20:16:01 -05:00
Eli Zaretskii
4f1948eb4c display.texi (Optional Mode Line): Make the description of load-average
more accurate.
2010-12-04 13:45:59 +02:00
Eli Zaretskii
62d72a4a69 Describe MS-Windows specific startup issues, incl. emacsclientw.exe
msdog.texi (Windows Startup): New node.  Move the stuff about the current
 directory from "Windows HOME", and explain all possible ways of invoking
 Emacs on Windows.
2010-12-04 13:25:09 +02:00
Eli Zaretskii
b8a9e13683 msdog.texi (Windows HOME): Mention that HOME can also be set in the registry,
with a cross-reference.
2010-12-04 12:22:45 +02:00
Chong Yidong
07976ae3b8 Merge changes from emacs-23 branch 2010-11-27 15:04:57 -05:00
Bob Rogers
17a6e2788d Small VC fixes for doc/emacs.
* doc/emacs/maintaining.texi (VC With A Locking VCS, VC Directory Commands):
* doc/emacs/vc1-xtra.texi (Customizing VC, General VC Options): Small fixes.
2010-11-23 00:18:26 -08:00
Chong Yidong
0d6607ab81 * maintaining.texi (Version Control Systems): Fix repeated sentence.
Suggested by Štěpán Němec.
2010-11-21 11:05:27 -05:00
Chong Yidong
1aaae3f39e Document VC headers and other VC changes.
* maintaining.texi (Version Control): Say "commit", not "check in".
(Version Control Systems): Simplify descriptions.
(VCS Merging, VCS Changesets, VCS Repositories): New nodes, split from
VCS Concepts.
(VC Mode Line): Update example.
(Old Revisions): Document revert-buffer for vc-diff.
(Log Buffer): Promote to a subsection.  Document header lines.

* emacs.texi (Top): Update node listing.
2010-11-20 18:16:10 -05:00
Chong Yidong
ec8a6295a0 Document some Emacs 23.3 changes in manuals.
* doc/emacs/macos.texi (Mac / GNUstep Basics): Document
ns-right-alternate-modifier.

* doc/lispref/numbers.texi (Float Basics): Document float-e and float-pi.

* doc/lispref/symbols.texi (Creating Symbols): Using unintern without an
obarray arg is now obsolete.

* doc/lispref/text.texi (Kill Functions, Kill Functions)
(Low-Level Kill Ring, Low-Level Kill Ring): Remove obsolete
YANK-HANDLER args.

* doc/lispref/variables.texi (Defining Variables): Change "pi" example to
"float-pi".
2010-11-20 14:52:20 -05:00
Eli Zaretskii
0eb025fb55 Fix and document display of glyphless characters.
src/xdisp.c (set_cursor_from_row): Fix cursor positioning on
 zero-width characters.
 (syms_of_xdisp) <glyphless-char-display>: Doc fix.
 src/.gdbinit (pgx): Adapt to latest changes in `struct glyph'.
 src/w32term.c (x_draw_glyphless_glyph_string_foreground): Draw the
 box before drawing the glyphs inside it.
 src/dispextern.h (enum glyphless_display_method): Rename
 GLYPHLESS_DISPLAY_HEXA_CODE to GLYPHLESS_DISPLAY_HEX_CODE.  All
 users changed.
 src/term.c (append_glyphless_glyph, produce_glyphless_glyph): Fix
 comments.
 (produce_glyphless_glyph): Enclose "U+nnnn" and "empty box"
 whitespace in "[]", to simulate a box.  Don't use uninitialized
 variable `width'.
 lisp/international/characters.el (glyphless-char-display-control):
 Renamed from glyphless-char-control; all users changed.  Doc fix.
 Signal an error if display method is not one of the recognized
 symbols.
 doc/emacs/rmail.texi (Rmail Coding): Characters with no fonts are not
 necessarily displayed as empty boxes.
 doc/emacs/mule.texi (Language Environments, Fontsets): Characters with no
 fonts are not necessarily displayed as empty boxes.
 doc/emacs/display.texi (Text Display): Document display of glyphless
 characters.
 doc/lispref/display.texi (Usual Display): Characters with no fonts are not
 necessarily displayed as empty boxes.
 etc/NEWS: Document display of glyphless characters.
2010-11-13 15:29:31 +02:00
Glenn Morris
ea4f775071 Document count-words-region.
* doc/emacs/basic.texi (Position Info): Add M-x count-words-region.

* doc/lispintro/emacs-lisp-intro.texi: Rename the `count-words-region' example,
since there is now a standard command of that name.

* etc/NEWS: Mention it.
2010-11-12 19:48:16 -08:00
Glenn Morris
90639ceacd * doc/misc/msdog.texi (ls in Lisp): Update for ls-lisp.el changes. 2010-11-11 00:41:30 -08:00
Stefan Monnier
d607b96bc2 Merge from emacs-23 2010-11-09 15:07:10 -05:00
Eli Zaretskii
a16b2d46ff Fix bug #7300.
msdog.texi (Windows HOME): Add information regarding startup
 directory when invoking Emacs from a desktop shortcut.
2010-11-06 12:23:33 +02:00
Juanma Barranquero
c0943d3db2 Fix typos in docstrings, comments and ChangeLogs.
* etc/tutorials/TUTORIAL.es: Fix typos.

* lisp/cedet/semantic/symref/list.el (semantic-symref-list-rename-open-hits):
  Fix typo in message.
  (semantic-symref-list-map-open-hits): Fix typo in docstring.

* lisp/erc/erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.

* lisp/gnus/nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring.

* lisp/international/mule.el (define-coding-system):
* lisp/international/titdic-cnv.el (quail-cxterm-package-ext-info):
* composite.el (compose-region): Fix typo in docstring.

* lisp/org/org-agenda.el (org-prefix-category-length)
  (org-prefix-category-max-length): Fix typos in docstrings.

* src/font.c (Ffont_variation_glyphs):
* ccl.c (Fccl_execute_on_string): Fix typo in docstring.
2010-10-13 01:25:19 +02:00
Glenn Morris
df187c6252 Add explicit -I$srcdir to makeinfo in some doc/ Makefiles.
* doc/emacs/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* doc/lispintro/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* doc/lispref/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
2010-10-10 18:57:48 -07:00