mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 10:27:41 +00:00
Merge from trunk.
This commit is contained in:
Paul Eggert
commit
2b64ccd2b5
43 changed files with 438 additions and 298 deletions
|
|
@ -1,4 +1,4 @@
|
|||
2011-07-11 Paul Eggert <eggert@cs.ucla.edu>
|
||||
2011-07-12 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Assume freestanding C89 headers, string.h, stdlib.h.
|
||||
Again, this simplifies the code, and all current platforms have these.
|
||||
|
|
@ -13,6 +13,11 @@
|
|||
can add the gnulib modules for these (a 1-line change to Makefile.in).
|
||||
* configure.in: Don't check for memcmp, memcpy, memmove, memset.
|
||||
|
||||
2011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin
|
||||
so as to suppress address randomization (Bug#8395).
|
||||
|
||||
2011-07-09 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* lib/stdint.in.h: Merge from gnulib (Bug#9025).
|
||||
|
|
|
|||
2
autogen/configure
vendored
2
autogen/configure
vendored
|
|
@ -21515,7 +21515,7 @@ case "$opsys" in
|
|||
libs_nsgui=
|
||||
headerpad_extra=690
|
||||
fi
|
||||
LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
|
||||
LD_SWITCH_SYSTEM_TEMACS="-fno-pie -prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
|
||||
|
||||
## This is here because src/Makefile.in did some extra fiddling around
|
||||
## with LD_SWITCH_SYSTEM. The cpp logic was:
|
||||
|
|
|
|||
|
|
@ -3347,7 +3347,7 @@ case "$opsys" in
|
|||
libs_nsgui=
|
||||
headerpad_extra=690
|
||||
fi
|
||||
LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
|
||||
LD_SWITCH_SYSTEM_TEMACS="-fno-pie -prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
|
||||
|
||||
## This is here because src/Makefile.in did some extra fiddling around
|
||||
## with LD_SWITCH_SYSTEM. The cpp logic was:
|
||||
|
|
|
|||
|
|
@ -1,3 +1,41 @@
|
|||
2011-07-12 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* misc.texi (Amusements): Move dissociated press here, from its
|
||||
own section.
|
||||
|
||||
* emacs.texi (Top): Update node listing.
|
||||
|
||||
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* emacs.texi (Top): Change "inferiors" to "subnodes" for greater
|
||||
clarity (bug#3523).
|
||||
|
||||
2011-07-12 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* cmdargs.texi (Initial Options): Document --no-site-lisp.
|
||||
(Misc X): Document --parent-id.
|
||||
|
||||
* frames.texi (Frame Commands): Note that focus-follows-mouse now
|
||||
defaults to nil.
|
||||
|
||||
* misc.texi (emacsclient Options): Document --parent-id.
|
||||
|
||||
* msdog.texi (Windows HOME): Document _emacs as obsolete.
|
||||
|
||||
2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* emacs.texi: Use "..." instead of ``...'' in the menus
|
||||
(bug#3503).
|
||||
|
||||
2011-07-11 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* killing.texi (Primary Selection): Document `only' setting for
|
||||
select-active-regions.
|
||||
|
||||
* mark.texi (Setting Mark): Reference Shift Selection node.
|
||||
|
||||
* frames.texi (Mouse Commands): Document mouse-yank-primary.
|
||||
|
||||
2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* mark.texi (Setting Mark): Clarify what's meant by "Shifted
|
||||
|
|
|
|||
|
|
@ -289,9 +289,14 @@ like this, the Customize facility does not allow options to be saved
|
|||
@item --no-site-file
|
||||
@opindex --no-site-file
|
||||
@cindex @file{site-start.el} file, not loading
|
||||
Do not load @file{site-start.el}. The options @samp{-q}, @samp{-u}
|
||||
and @samp{--batch} have no effect on the loading of this file---this
|
||||
option and @samp{-Q} are the only options that block it.
|
||||
Do not load @file{site-start.el} (@pxref{Init File}). The @samp{-Q}
|
||||
option does this too, but other options like @samp{-q} do not.
|
||||
|
||||
@item --no-site-lisp
|
||||
@opindex --no-site-lisp
|
||||
@cindex @file{site-start.el} file, not loading
|
||||
Do not include the @file{site-lisp} directories in @code{load-path}
|
||||
(@pxref{Init File}). The @samp{-Q} option does this too.
|
||||
|
||||
@item --no-splash
|
||||
@opindex --no-splash
|
||||
|
|
@ -307,9 +312,9 @@ in your initialization file (@pxref{Entering Emacs}).
|
|||
@itemx --quick
|
||||
@opindex --quick
|
||||
Start emacs with minimum customizations, similar to using @samp{-q},
|
||||
@samp{--no-site-file}, and @samp{--no-splash} together. This also
|
||||
stops Emacs from processing X resources by setting
|
||||
@code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
|
||||
@samp{--no-site-file}, @samp{--no-site-lisp}, and @samp{--no-splash}
|
||||
together. This also stops Emacs from processing X resources by
|
||||
setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
|
||||
|
||||
@item -daemon
|
||||
@opindex -daemon
|
||||
|
|
@ -1131,6 +1136,11 @@ use---usually just a small rectangle containing the frame's title.
|
|||
@c Enable horizontal scroll bars. Since horizontal scroll bars
|
||||
@c are not yet implemented, this actually does nothing.
|
||||
|
||||
@item --parent-id @var{ID}
|
||||
Open Emacs as a client X window via the XEmbed protocol, with @var{ID}
|
||||
as the parent X window id. Currently, this option is mainly useful
|
||||
for developers.
|
||||
|
||||
@item -vb
|
||||
@opindex -vb
|
||||
@itemx --vertical-scroll-bars
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ Fundamental Editing Commands
|
|||
* Help:: Commands for asking Emacs about its commands.
|
||||
|
||||
Important Text-Changing Commands
|
||||
* Mark:: The mark: how to delimit a ``region'' of text.
|
||||
* Mark:: The mark: how to delimit a "region" of text.
|
||||
* Killing:: Killing (cutting) text.
|
||||
* Yanking:: Recovering killed text. Moving text. (Pasting.)
|
||||
* Cut and Paste:: Clipboard and selections on graphical displays.
|
||||
|
|
@ -200,7 +200,7 @@ Advanced Features
|
|||
@end ifnottex
|
||||
* Sending Mail:: Sending mail in Emacs.
|
||||
* Rmail:: Reading mail in Emacs.
|
||||
* Dired:: You can ``edit'' a directory to manage files in it.
|
||||
* Dired:: You can "edit" a directory to manage files in it.
|
||||
* Calendar/Diary:: The calendar and diary facilities.
|
||||
* Document View:: Viewing PDF, PS and DVI files.
|
||||
* Gnus:: A flexible mail and news reader.
|
||||
|
|
@ -219,7 +219,6 @@ Advanced Features
|
|||
"recursive editing level".
|
||||
* Emulation:: Emulating some other editors with Emacs.
|
||||
* Hyperlinking:: Following links in buffers.
|
||||
* Dissociated Press:: Dissociating text for fun.
|
||||
* Amusements:: Various games and hacks.
|
||||
* Customization:: Modifying the behavior of Emacs.
|
||||
|
||||
|
|
@ -251,7 +250,7 @@ Appendices
|
|||
--- The Detailed Node Listing ---
|
||||
---------------------------------
|
||||
|
||||
Here are some other nodes which are really inferiors of the ones
|
||||
Here are some other nodes which are really subnodes of the ones
|
||||
already listed, mentioned here so you can get to them in one step:
|
||||
|
||||
The Organization of the Screen
|
||||
|
|
@ -1066,7 +1065,7 @@ Customization
|
|||
to decide what to do; by setting variables,
|
||||
you can control their functioning.
|
||||
* Key Bindings:: Keymaps say what command each key runs.
|
||||
By changing them, you can ``redefine'' keys.
|
||||
By changing them, you can "redefine" keys.
|
||||
* Init File:: How to write common customizations in the
|
||||
@file{.emacs} file.
|
||||
|
||||
|
|
|
|||
|
|
@ -119,16 +119,21 @@ entirely on the screen. The number of lines scrolled per step depends
|
|||
on how far away from the window edge the mouse has gone; the variable
|
||||
@code{mouse-scroll-min-lines} specifies a minimum step size.
|
||||
|
||||
@findex mouse-yank-primary
|
||||
@findex mouse-yank-at-click
|
||||
@vindex mouse-yank-at-point
|
||||
Clicking with the middle mouse button, @kbd{Mouse-2}, moves point to
|
||||
the position where you clicked and performs a yank
|
||||
(@code{mouse-yank-at-click}). @xref{Yanking}. If you change the
|
||||
variable @code{mouse-yank-at-point} to a non-@code{nil} value,
|
||||
@kbd{Mouse-2} does not move point. Then it does not matter where you
|
||||
click, or even which of the frame's windows you click on; the yank
|
||||
occurs at the existing point. This variable also affects yanking the
|
||||
primary and secondary selections (@pxref{Primary Selection}).
|
||||
the position where you clicked and inserts the contents of the primary
|
||||
selection (@code{mouse-yank-primary}). @xref{Primary Selection}.
|
||||
This behavior is consistent with other X applications; alternatively,
|
||||
you can rebind @kbd{Mouse-2} to @code{mouse-yank-at-click}, which
|
||||
performs a yank at point.
|
||||
|
||||
@vindex mouse-yank-at-point
|
||||
If you change the variable @code{mouse-yank-at-point} to a
|
||||
non-@code{nil} value, @kbd{Mouse-2} does not move point; it inserts
|
||||
the text at point, regardless of where you clicked or even which of
|
||||
the frame's windows you clicked on. This variable affects both
|
||||
@code{mouse-yank-primary} and @code{mouse-yank-at-click}.
|
||||
|
||||
@findex mouse-save-then-kill
|
||||
Clicking with the right mouse button, @kbd{Mouse-3}, runs the
|
||||
|
|
@ -455,15 +460,15 @@ this case, @kbd{C-x 5 0} can delete the last interactive frame; you
|
|||
can use @command{emacsclient} to reconnect to the Emacs session.
|
||||
|
||||
@vindex focus-follows-mouse
|
||||
On X, you may have to tell Emacs how the system (or the window
|
||||
manager) handles focus-switching between windows, in order for the
|
||||
command @kbd{C-x 5 o} (@code{other-frame}) to work properly.
|
||||
Unfortunately, there is no way for Emacs to detect this automatically,
|
||||
so you should set the variable @code{focus-follows-mouse}. If simply
|
||||
moving the mouse onto a window selects it and gives it focus, the
|
||||
variable should be @code{t}; if you have to click on the window to
|
||||
select it, the variable should be @code{nil}. The default is
|
||||
@code{t}.
|
||||
On X, you may have to tell Emacs how the window manager handles
|
||||
focus-switching between windows, in order for @kbd{C-x 5 o}
|
||||
(@code{other-frame}) to work properly. Unfortunately, there is no way
|
||||
for Emacs to detect this automatically, so you should set the variable
|
||||
@code{focus-follows-mouse}. The default is @code{nil}, meaning you
|
||||
have to click on the window to select it (the default for most modern
|
||||
window managers). You should change it to @code{t} if your window
|
||||
manager selects and window and gives it focus anytime you move the
|
||||
mouse onto the window.
|
||||
|
||||
The window manager that is part of MS-Windows always gives focus to
|
||||
a frame that raises, so this variable has no effect in the native
|
||||
|
|
|
|||
|
|
@ -520,17 +520,19 @@ contents are more ``fragile''; they are overwritten by any mouse
|
|||
selection, whereas the clipboard is only overwritten by explicit
|
||||
``cut'' or ``copy'' commands.
|
||||
|
||||
Under X, whenever you select some text in Emacs by dragging or
|
||||
clicking the mouse (@pxref{Mouse Commands}), it is also saved to the
|
||||
primary selection.
|
||||
Under X, whenever you set an active region (@pxref{Mark}), Emacs
|
||||
saves the text in the active region to the primary selection. This
|
||||
applies to active regions made by dragging or clicking the mouse
|
||||
(@pxref{Mouse Commands}), and those made by keyboard commands (e.g. by
|
||||
typing @kbd{C-@key{SPC}} and moving point; see @ref{Setting Mark}).
|
||||
|
||||
@vindex select-active-regions
|
||||
If you set the region using the keyboard---for instance, by typing
|
||||
@kbd{C-@key{SPC}} and moving point away from the mark---the text in
|
||||
the region is also saved to the primary selection. (The updating of
|
||||
the primary selection is done at the end of each command, as long as
|
||||
the region is active and non-empty.) To disable this behavior, change
|
||||
the variable @code{select-active-regions} to @code{nil}.
|
||||
If you change the variable @code{select-active-regions} to
|
||||
@code{only}, Emacs saves only temporarily active regions to the
|
||||
primary selection, i.e. those made with the mouse or with shift
|
||||
selection (@pxref{Shift Selection}). If you change
|
||||
@code{select-active-regions} to @code{nil}, Emacs avoids saving active
|
||||
regions to the primary selection entirely.
|
||||
|
||||
To insert the primary selection into an Emacs buffer, click
|
||||
@kbd{mouse-2} (@code{mouse-yank-primary}) where you want to insert it.
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@ Set point and the mark around the text you drag across.
|
|||
@item Mouse-3
|
||||
Set the mark at point, then move point to where you click
|
||||
(@code{mouse-save-then-kill}).
|
||||
@item @samp{Shifted cursor motion keys}
|
||||
Set the mark at point if the mark is inactive, then move point.
|
||||
@xref{Shift Selection}.
|
||||
@end table
|
||||
|
||||
Also, the shifted motion keys (for example, @key{S-Right}) will set
|
||||
the mark at point if the mark is inactive, then move point.
|
||||
|
||||
@kindex C-SPC
|
||||
@kindex C-@@
|
||||
@findex set-mark-command
|
||||
|
|
|
|||
|
|
@ -1678,6 +1678,11 @@ all server buffers are finished. You can take as long as you like to
|
|||
edit the server buffers within Emacs, and they are @emph{not} killed
|
||||
when you type @kbd{C-x #} in them.
|
||||
|
||||
@item --parent-id @var{ID}
|
||||
Open an @command{emacsclient} frame as a client frame in the parent X
|
||||
window with id @var{ID}, via the XEmbed protocol. Currently, this
|
||||
option is mainly useful for developers.
|
||||
|
||||
@item -q
|
||||
@itemx --quiet
|
||||
Do not let @command{emacsclient} display messages about waiting for
|
||||
|
|
@ -2567,7 +2572,7 @@ not use it.
|
|||
key bindings.
|
||||
@end table
|
||||
|
||||
@node Hyperlinking, Dissociated Press, Emulation, Top
|
||||
@node Hyperlinking, Amusements, Emulation, Top
|
||||
@section Hyperlinking and Navigation Features
|
||||
|
||||
@cindex hyperlinking
|
||||
|
|
@ -2733,81 +2738,14 @@ Display a menu of files and URLs mentioned in current buffer, then
|
|||
find the one you select (@code{ffap-menu}).
|
||||
@end table
|
||||
|
||||
@node Dissociated Press, Amusements, Hyperlinking, Top
|
||||
@section Dissociated Press
|
||||
|
||||
@findex dissociated-press
|
||||
@kbd{M-x dissociated-press} is a command for scrambling a file of text
|
||||
either word by word or character by character. Starting from a buffer of
|
||||
straight English, it produces extremely amusing output. The input comes
|
||||
from the current Emacs buffer. Dissociated Press writes its output in a
|
||||
buffer named @samp{*Dissociation*}, and redisplays that buffer after every
|
||||
couple of lines (approximately) so you can read the output as it comes out.
|
||||
|
||||
Dissociated Press asks every so often whether to continue generating
|
||||
output. Answer @kbd{n} to stop it. You can also stop at any time by
|
||||
typing @kbd{C-g}. The dissociation output remains in the
|
||||
@samp{*Dissociation*} buffer for you to copy elsewhere if you wish.
|
||||
|
||||
@cindex presidentagon
|
||||
Dissociated Press operates by jumping at random from one point in
|
||||
the buffer to another. In order to produce plausible output rather
|
||||
than gibberish, it insists on a certain amount of overlap between the
|
||||
end of one run of consecutive words or characters and the start of the
|
||||
next. That is, if it has just output `president' and then decides to
|
||||
jump to a different point in the buffer, it might spot the `ent' in
|
||||
`pentagon' and continue from there, producing `presidentagon'. Long
|
||||
sample texts produce the best results.
|
||||
|
||||
@cindex againformation
|
||||
A positive argument to @kbd{M-x dissociated-press} tells it to operate
|
||||
character by character, and specifies the number of overlap characters. A
|
||||
negative argument tells it to operate word by word, and specifies the number
|
||||
of overlap words. In this mode, whole words are treated as the elements to
|
||||
be permuted, rather than characters. No argument is equivalent to an
|
||||
argument of two. For your againformation, the output goes only into the
|
||||
buffer @samp{*Dissociation*}. The buffer you start with is not changed.
|
||||
|
||||
@cindex Markov chain
|
||||
@cindex ignoriginal
|
||||
@cindex techniquitous
|
||||
Dissociated Press produces results fairly like those of a Markov
|
||||
chain based on a frequency table constructed from the sample text. It
|
||||
is, however, an independent, ignoriginal invention. Dissociated Press
|
||||
techniquitously copies several consecutive characters from the sample
|
||||
text between random jumps, unlike a Markov chain which would jump
|
||||
randomly after each word or character. This makes for more plausible
|
||||
sounding results, and runs faster.
|
||||
|
||||
@cindex outragedy
|
||||
@cindex buggestion
|
||||
@cindex properbose
|
||||
@cindex mustatement
|
||||
@cindex developediment
|
||||
@cindex userenced
|
||||
It is a mustatement that too much use of Dissociated Press can be a
|
||||
developediment to your real work, sometimes to the point of outragedy.
|
||||
And keep dissociwords out of your documentation, if you want it to be well
|
||||
userenced and properbose. Have fun. Your buggestions are welcome.
|
||||
|
||||
@node Amusements, Customization, Dissociated Press, Top
|
||||
@node Amusements, Customization, Hyperlinking, Top
|
||||
@section Other Amusements
|
||||
@cindex boredom
|
||||
@findex hanoi
|
||||
@findex gomoku
|
||||
@cindex tower of Hanoi
|
||||
|
||||
If you are a little bit bored, you can try @kbd{M-x hanoi}. If you are
|
||||
considerably bored, give it a numeric argument. If you are very, very
|
||||
bored, try an argument of 9. Sit back and watch.
|
||||
|
||||
@cindex Go Moku
|
||||
If you want a little more personal involvement, try @kbd{M-x gomoku},
|
||||
which plays the game Go Moku with you.
|
||||
|
||||
@findex bubbles
|
||||
@kbd{M-x bubbles} is a game in which the object is to remove as many
|
||||
bubbles as you can in the smallest number of moves.
|
||||
@findex animate-birthday-present
|
||||
@cindex animate
|
||||
The @code{animate} package makes text dance. For an example, try
|
||||
@kbd{M-x animate-birthday-present}.
|
||||
|
||||
@findex blackbox
|
||||
@findex mpuz
|
||||
|
|
@ -2820,70 +2758,82 @@ puzzle with letters standing for digits in a code that you must
|
|||
guess---to guess a value, type a letter and then the digit you think it
|
||||
stands for. The aim of @code{5x5} is to fill in all the squares.
|
||||
|
||||
@findex bubbles
|
||||
@kbd{M-x bubbles} is a game in which the object is to remove as many
|
||||
bubbles as you can in the smallest number of moves.
|
||||
|
||||
@findex decipher
|
||||
@cindex ciphers
|
||||
@cindex cryptanalysis
|
||||
@kbd{M-x decipher} helps you to cryptanalyze a buffer which is encrypted
|
||||
in a simple monoalphabetic substitution cipher.
|
||||
@kbd{M-x decipher} helps you to cryptanalyze a buffer which is
|
||||
encrypted in a simple monoalphabetic substitution cipher.
|
||||
|
||||
@findex dissociated-press
|
||||
@kbd{M-x dissociated-press} scrambles the text in the current Emacs
|
||||
buffer, word by word or character by character, writing its output to
|
||||
a buffer named @samp{*Dissociation*}. A positive argument tells it to
|
||||
operate character by character, and specifies the number of overlap
|
||||
characters. A negative argument tells it to operate word by word, and
|
||||
specifies the number of overlap words. Dissociated Press produces
|
||||
results fairly like those of a Markov chain, but is however, an
|
||||
independent, ignoriginal invention; it techniquitously copies several
|
||||
consecutive characters from the sample text between random jumps,
|
||||
unlike a Markov chain which would jump randomly after each word or
|
||||
character. Keep dissociwords out of your documentation, if you want
|
||||
it to be well userenced and properbose.
|
||||
|
||||
@findex dunnet
|
||||
@kbd{M-x dunnet} runs an adventure-style exploration game, which is
|
||||
a bigger sort of puzzle.
|
||||
@kbd{M-x dunnet} runs an text-based adventure game.
|
||||
|
||||
@findex lm
|
||||
@cindex landmark game
|
||||
@kbd{M-x lm} runs a relatively non-participatory game in which a robot
|
||||
attempts to maneuver towards a tree at the center of the window based on
|
||||
unique olfactory cues from each of the four directions.
|
||||
@findex gomoku
|
||||
@cindex Go Moku
|
||||
If you want a little more personal involvement, try @kbd{M-x gomoku},
|
||||
which plays the game Go Moku with you.
|
||||
|
||||
@cindex tower of Hanoi
|
||||
@findex hanoi
|
||||
If you are a little bit bored, you can try @kbd{M-x hanoi}. If you are
|
||||
considerably bored, give it a numeric argument. If you are very, very
|
||||
bored, try an argument of 9. Sit back and watch.
|
||||
|
||||
@findex life
|
||||
@cindex Life
|
||||
@kbd{M-x life} runs Conway's ``Life'' cellular automaton.
|
||||
@kbd{M-x life} runs Conway's ``Life'' cellular automaton.
|
||||
|
||||
@findex lm
|
||||
@cindex landmark game
|
||||
@kbd{M-x lm} runs a relatively non-participatory game in which a
|
||||
robot attempts to maneuver towards a tree at the center of the window
|
||||
based on unique olfactory cues from each of the four directions.
|
||||
|
||||
@findex morse-region
|
||||
@findex unmorse-region
|
||||
@cindex Morse code
|
||||
@cindex --/---/.-./.../.
|
||||
@kbd{M-x morse-region} converts text in a region to Morse code and
|
||||
@kbd{M-x morse-region} converts text in a region to Morse code and
|
||||
@kbd{M-x unmorse-region} converts it back. No cause for remorse.
|
||||
|
||||
@findex pong
|
||||
@cindex Pong game
|
||||
@kbd{M-x pong} plays a Pong-like game, bouncing the ball off opposing
|
||||
bats.
|
||||
|
||||
@findex solitaire
|
||||
@cindex solitaire
|
||||
@kbd{M-x solitaire} plays a game of solitaire in which you jump pegs
|
||||
across other pegs.
|
||||
|
||||
@findex animate-birthday-present
|
||||
@cindex animate
|
||||
The @code{animate} package makes text dance. For an example, try
|
||||
@kbd{M-x animate-birthday-present}.
|
||||
|
||||
@findex studlify-region
|
||||
@cindex StudlyCaps
|
||||
@kbd{M-x studlify-region} studlify-cases the region, producing
|
||||
text like this:
|
||||
|
||||
@example
|
||||
M-x stUdlIfY-RegioN stUdlIfY-CaSeS thE region.
|
||||
@end example
|
||||
|
||||
@findex tetris
|
||||
@cindex Tetris
|
||||
@findex snake
|
||||
@cindex Snake
|
||||
@kbd{M-x tetris} runs an implementation of the well-known Tetris game.
|
||||
Likewise, @kbd{M-x snake} provides an implementation of Snake.
|
||||
@kbd{M-x pong}, @kbd{M-x snake} and @kbd{M-x tetris} are
|
||||
implementations of the well-known Pong, Snake and Tetris games.
|
||||
|
||||
When you are frustrated, try the famous Eliza program. Just do
|
||||
@kbd{M-x doctor}. End each input by typing @key{RET} twice.
|
||||
@findex solitaire
|
||||
@cindex solitaire
|
||||
@kbd{M-x solitaire} plays a game of solitaire in which you jump pegs
|
||||
across other pegs.
|
||||
|
||||
@findex zone
|
||||
The command @kbd{M-x zone} plays games with the display when Emacs is
|
||||
idle.
|
||||
The command @kbd{M-x zone} plays games with the display when Emacs
|
||||
is idle.
|
||||
|
||||
Finally, if you find yourself frustrated, try the famous Eliza
|
||||
program. Just do @kbd{M-x doctor}. End each input by typing
|
||||
@key{RET} twice.
|
||||
|
||||
@ifnottex
|
||||
@lowersections
|
||||
|
|
|
|||
|
|
@ -445,10 +445,10 @@ any name mentioned in @ref{Init File}.
|
|||
|
||||
@cindex @file{_emacs} init file, MS-Windows
|
||||
Because MS-DOS does not allow file names with leading dots, and
|
||||
because older Windows systems made it hard to create files with such
|
||||
names, the Windows port of Emacs supports an alternative name
|
||||
@file{_emacs} as a fallback, if such a file exists in the home
|
||||
directory, whereas @file{.emacs} does not.
|
||||
older Windows systems made it hard to create files with such names,
|
||||
the Windows port of Emacs supports an init file name @file{_emacs}, if
|
||||
such a file exists in the home directory and @file{.emacs} does not.
|
||||
This name is considered obsolete.
|
||||
|
||||
@node Windows Keyboard
|
||||
@section Keyboard Usage on MS-Windows
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* elisp.texi: Change "inferiors" to "subnodes" in three places
|
||||
(bug#3523).
|
||||
|
||||
2011-07-11 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* frames.texi (Window System Selections): Discussion of
|
||||
x-select-enable-clipboard moved to Emacs manual.
|
||||
|
||||
2011-07-11 Deniz Dogan <deniz@dogan.se>
|
||||
|
||||
* commands.texi (Prefix Command Arguments): Remove excessive
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ Appendices
|
|||
--- The Detailed Node Listing ---
|
||||
---------------------------------
|
||||
|
||||
Here are other nodes that are inferiors of those already listed,
|
||||
Here are other nodes that are subnodes of those already listed,
|
||||
mentioned here so you can get to them in one step:
|
||||
|
||||
Introduction
|
||||
|
|
|
|||
|
|
@ -1959,30 +1959,34 @@ defined in the file @file{lisp/term/x-win.el}. Use @kbd{M-x apropos
|
|||
@node Window System Selections
|
||||
@section Window System Selections
|
||||
@cindex selection (for window systems)
|
||||
@cindex clipboard
|
||||
@cindex primary selection
|
||||
@cindex secondary selection
|
||||
|
||||
The X server records a set of @dfn{selections} which permit transfer of
|
||||
data between application programs. The various selections are
|
||||
distinguished by @dfn{selection types}, represented in Emacs by
|
||||
symbols. X clients including Emacs can read or set the selection for
|
||||
any given type.
|
||||
In the X window system, data can be transferred between different
|
||||
applications by means of @dfn{selections}. X defines an arbitrary
|
||||
number of @dfn{selection types}, each of which can store its own data;
|
||||
however, only three are commonly used: the @dfn{clipboard},
|
||||
@dfn{primary selection}, and @dfn{secondary selection}. @xref{Cut and
|
||||
Paste,, Cut and Paste, emacs, The GNU Emacs Manual}, for Emacs
|
||||
commands that make use of these selections. This section documents
|
||||
the low-level functions for reading and setting X selections.
|
||||
|
||||
@deffn Command x-set-selection type data
|
||||
This function sets a ``selection'' in the X server. It takes two
|
||||
arguments: a selection type @var{type}, and the value to assign to it,
|
||||
@var{data}. If @var{data} is @code{nil}, it means to clear out the
|
||||
selection. Otherwise, @var{data} may be a string, a symbol, an integer
|
||||
(or a cons of two integers or list of two integers), an overlay, or a
|
||||
cons of two markers pointing to the same buffer. An overlay or a pair
|
||||
of markers stands for text in the overlay or between the markers.
|
||||
This function sets an X selection. It takes two arguments: a
|
||||
selection type @var{type}, and the value to assign to it, @var{data}.
|
||||
|
||||
The argument @var{data} may also be a vector of valid non-vector
|
||||
selection values.
|
||||
@var{type} should be a symbol; it is usually one of @code{PRIMARY},
|
||||
@code{SECONDARY} or @code{CLIPBOARD}. These are symbols with
|
||||
upper-case names, in accord with X Window System conventions. If
|
||||
@var{type} is @code{nil}, that stands for @code{PRIMARY}.
|
||||
|
||||
Each possible @var{type} has its own selection value, which changes
|
||||
independently. The usual values of @var{type} are @code{PRIMARY},
|
||||
@code{SECONDARY} and @code{CLIPBOARD}; these are symbols with upper-case
|
||||
names, in accord with X Window System conventions. If @var{type} is
|
||||
@code{nil}, that stands for @code{PRIMARY}.
|
||||
If @var{data} is @code{nil}, it means to clear out the selection.
|
||||
Otherwise, @var{data} may be a string, a symbol, an integer (or a cons
|
||||
of two integers or list of two integers), an overlay, or a cons of two
|
||||
markers pointing to the same buffer. An overlay or a pair of markers
|
||||
stands for text in the overlay or between the markers. The argument
|
||||
@var{data} may also be a vector of valid non-vector selection values.
|
||||
|
||||
This function returns @var{data}.
|
||||
@end deffn
|
||||
|
|
@ -2019,14 +2023,6 @@ and @code{x-set-selection} on MS-Windows support the text data type
|
|||
only; if the clipboard holds other types of data, Emacs treats the
|
||||
clipboard as empty.
|
||||
|
||||
@defopt x-select-enable-clipboard
|
||||
If this is non-@code{nil}, the Emacs yank functions consult the
|
||||
clipboard before the primary selection, and the kill functions store in
|
||||
the clipboard as well as the primary selection. Otherwise they do not
|
||||
access the clipboard at all. The default is @code{t} on systems with
|
||||
clipboards.
|
||||
@end defopt
|
||||
|
||||
@node Drag and Drop
|
||||
@section Drag and Drop
|
||||
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ Appendices
|
|||
--- The Detailed Node Listing ---
|
||||
---------------------------------
|
||||
|
||||
Here are other nodes that are inferiors of those already listed,
|
||||
Here are other nodes that are subnodes of those already listed,
|
||||
mentioned here so you can get to them in one step:
|
||||
|
||||
Introduction
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ Appendices
|
|||
--- The Detailed Node Listing ---
|
||||
---------------------------------
|
||||
|
||||
Here are other nodes that are inferiors of those already listed,
|
||||
Here are other nodes that are subnodes of those already listed,
|
||||
mentioned here so you can get to them in one step:
|
||||
|
||||
Introduction
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2011-07-12 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* emacsclient.1: Document exit status.
|
||||
|
||||
2011-06-25 Andreas Rottmann <a.rottmann@gmx.at>
|
||||
|
||||
* emacsclient.1: Mention --frame-parameters.
|
||||
|
|
|
|||
|
|
@ -87,6 +87,9 @@ print version information and exit
|
|||
.TP
|
||||
.B \-H, \-\-help
|
||||
print this usage information message and exit
|
||||
.SH "EXIT STATUS"
|
||||
Normally, the exit status is 0. If emacsclient shuts down due to
|
||||
Emacs signaling an error, the exit status is 1.
|
||||
.SH "SEE ALSO"
|
||||
The program is documented fully in
|
||||
.IR "Using Emacs as a Server"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* org.texi (Special agenda views): Fix double quoting (bug#3509).
|
||||
|
||||
2011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* ediff.texi (Major Entry Points): Remove mention of `require',
|
||||
|
|
|
|||
|
|
@ -13981,25 +13981,25 @@ particular, you may use the functions @code{org-agenda-skip-entry-if}
|
|||
and @code{org-agenda-skip-subtree-if} in this form, for example:
|
||||
|
||||
@table @code
|
||||
@item '(org-agenda-skip-entry-if 'scheduled)
|
||||
@item (org-agenda-skip-entry-if 'scheduled)
|
||||
Skip current entry if it has been scheduled.
|
||||
@item '(org-agenda-skip-entry-if 'notscheduled)
|
||||
@item (org-agenda-skip-entry-if 'notscheduled)
|
||||
Skip current entry if it has not been scheduled.
|
||||
@item '(org-agenda-skip-entry-if 'deadline)
|
||||
@item (org-agenda-skip-entry-if 'deadline)
|
||||
Skip current entry if it has a deadline.
|
||||
@item '(org-agenda-skip-entry-if 'scheduled 'deadline)
|
||||
@item (org-agenda-skip-entry-if 'scheduled 'deadline)
|
||||
Skip current entry if it has a deadline, or if it is scheduled.
|
||||
@item '(org-agenda-skip-entry-if 'todo '("TODO" "WAITING"))
|
||||
@item (org-agenda-skip-entry-if 'todo '("TODO" "WAITING"))
|
||||
Skip current entry if the TODO keyword is TODO or WAITING.
|
||||
@item '(org-agenda-skip-entry-if 'todo 'done)
|
||||
@item (org-agenda-skip-entry-if 'todo 'done)
|
||||
Skip current entry if the TODO keyword marks a DONE state.
|
||||
@item '(org-agenda-skip-entry-if 'timestamp)
|
||||
@item (org-agenda-skip-entry-if 'timestamp)
|
||||
Skip current entry if it has any timestamp, may also be deadline or scheduled.
|
||||
@item '(org-agenda-skip-entry 'regexp "regular expression")
|
||||
@item (org-agenda-skip-entry 'regexp "regular expression")
|
||||
Skip current entry if the regular expression matches in the entry.
|
||||
@item '(org-agenda-skip-entry 'notregexp "regular expression")
|
||||
@item (org-agenda-skip-entry 'notregexp "regular expression")
|
||||
Skip current entry unless the regular expression matches.
|
||||
@item '(org-agenda-skip-subtree-if 'regexp "regular expression")
|
||||
@item (org-agenda-skip-subtree-if 'regexp "regular expression")
|
||||
Same as above, but check and skip the entire subtree.
|
||||
@end table
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
2011-07-12 Bill Wohler <wohler@newt.com>
|
||||
|
||||
Release MH-E version 8.2.91.
|
||||
|
||||
* NEWS, MH-E-NEWS: Update for MH-E release 8.2.91.
|
||||
|
||||
* MH-E-NEWS: Mention that SourceForge MH-E users will have to
|
||||
update their load-paths.
|
||||
|
||||
2011-07-10 Bill Wohler <wohler@newt.com>
|
||||
|
||||
Release MH-E version 8.2.90.
|
||||
|
|
|
|||
|
|
@ -3,6 +3,18 @@
|
|||
Copyright (C) 2001-2011 Free Software Foundation, Inc.
|
||||
See the end of the file for license conditions.
|
||||
|
||||
* Changes in MH-E 8.2.91
|
||||
|
||||
Version 8.2.91 fixes the folder window problem that was introduced
|
||||
in 8.2.90. It also fixes compilation warnings in XEmacs 21.5.31, as
|
||||
well as an error when running XEmacs 21.5.31 in a terminal.
|
||||
|
||||
Another implication of the VCS change is that users who download MH-E
|
||||
from SourceForge and explicitly load MH-E will have to be change their
|
||||
`load-path' to "/path/to/mh-e/emacs/trunk/lisp/mh-e" instead. Note the
|
||||
addition of "trunk."
|
||||
|
||||
This version of MH-E is packaged with GNU Emacs 24.1
|
||||
|
||||
* Changes in MH-E 8.2.90
|
||||
|
||||
|
|
@ -15,8 +27,7 @@ scripts.
|
|||
Otherwise, this is a small release that includes mostly internal
|
||||
changes from the Emacs team. One of these changes manifests itself in
|
||||
the user interface--you can now complete folders with abbreviations,
|
||||
meaning that `+f/b/b TAB' can complete to `+foo/bar/baz'. This version
|
||||
of MH-E is packaged with GNU Emacs 24.1
|
||||
meaning that `+f/b/b TAB' can complete to `+foo/bar/baz'.
|
||||
|
||||
Also, RFC 2047-encoded Subject header fields in replies are now
|
||||
decoded.
|
||||
|
|
|
|||
25
etc/NEWS
25
etc/NEWS
|
|
@ -58,13 +58,16 @@ automatically select it.
|
|||
|
||||
* Startup Changes in Emacs 24.1
|
||||
|
||||
---
|
||||
** The --unibyte, --multibyte, --no-multibyte, and --no-unibyte
|
||||
command line arguments, and the EMACS_UNIBYTE environment variable, no
|
||||
longer have any effect. (They were declared obsolete in Emacs 23.)
|
||||
|
||||
+++
|
||||
** New command line option `--no-site-lisp' removes site-lisp directories
|
||||
from load-path. -Q now implies this.
|
||||
|
||||
---
|
||||
** On Windows, Emacs now warns when the obsolete _emacs init file is used,
|
||||
and also when HOME is set to C:\ by default.
|
||||
|
||||
|
|
@ -77,6 +80,7 @@ pops up *Messages*" feature, which can now easily be changed.
|
|||
|
||||
** emacsclient changes
|
||||
|
||||
+++
|
||||
*** New emacsclient argument --parent-id ID can be used to open a
|
||||
client frame in parent X window ID, via XEmbed. This works like the
|
||||
--parent-id argument to Emacs.
|
||||
|
|
@ -88,10 +92,12 @@ client frame in parent X window ID, via XEmbed. This works like the
|
|||
*** New emacsclient argument --frame-parameters can be used to set the
|
||||
frame parameters of a newly-created graphical frame.
|
||||
|
||||
+++
|
||||
*** If emacsclient shuts down as a result of Emacs signalling an
|
||||
error, its exit status is 1.
|
||||
|
||||
** Completion
|
||||
|
||||
*** shell-mode uses pcomplete rules, with the standard completion UI.
|
||||
|
||||
*** Many packages have been changed to use completion-at-point rather than
|
||||
|
|
@ -353,6 +359,7 @@ replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
|
|||
** The standalone program `fakemail' has been removed.
|
||||
If you need it, feedmail.el ought to provide a superset of the functionality.
|
||||
|
||||
+++
|
||||
** The variable `focus-follows-mouse' now always defaults to nil.
|
||||
|
||||
** New primitive `secure-hash' that supports many secure hash algorithms
|
||||
|
|
@ -419,42 +426,52 @@ use the primary selection.
|
|||
In the following, we provide a list of these changes, followed by a
|
||||
list of steps to get the old behavior back if you prefer that.
|
||||
|
||||
*** `mouse-drag-copy-region' now defaults to nil.
|
||||
+++
|
||||
*** `select-active-regions' now defaults to t.
|
||||
Merely selecting text (e.g. with drag-mouse-1) no longer puts it in
|
||||
the kill-ring. The selected text is put in the primary selection, if
|
||||
the kill ring. The selected text is put in the primary selection, if
|
||||
the system possesses a separate primary selection facility (e.g. X).
|
||||
|
||||
+++
|
||||
**** `select-active-regions' also accepts a new value, `only'.
|
||||
This means to only set the primary selection for temporarily active
|
||||
regions (usually made by mouse-dragging or shift-selection);
|
||||
"ordinary" active regions, such as those made with C-SPC followed by
|
||||
point motion, do not alter the primary selection.
|
||||
|
||||
---
|
||||
**** `mouse-drag-copy-region' now defaults to nil.
|
||||
|
||||
+++
|
||||
*** mouse-2 is now bound to `mouse-yank-primary'.
|
||||
This pastes from the primary selection, ignoring the kill-ring.
|
||||
Previously, mouse-2 was bound to `mouse-yank-at-click'.
|
||||
|
||||
+++
|
||||
*** `x-select-enable-clipboard' now defaults to t on all platforms.
|
||||
+++
|
||||
*** `x-select-enable-primary' now defaults to nil.
|
||||
Thus, commands that kill text or copy it to the kill-ring (such as
|
||||
M-w, C-w, and C-k) also use the clipboard---not the primary selection.
|
||||
|
||||
---
|
||||
**** The "Copy", "Cut", and "Paste" items in the "Edit" menu are now
|
||||
exactly equivalent to, respectively M-w, C-w, and C-y.
|
||||
|
||||
---
|
||||
**** Note that on MS-Windows, `x-select-enable-clipboard' was already
|
||||
non-nil by default, as Windows does not support the primary selection
|
||||
between applications.
|
||||
|
||||
---
|
||||
*** To return to the previous behavior, do the following:
|
||||
|
||||
**** Change `select-active-regions' to nil.
|
||||
**** Change `mouse-drag-copy-region' to t.
|
||||
**** Change `x-select-enable-primary' to t (on X only).
|
||||
**** Change `x-select-enable-clipboard' to nil.
|
||||
**** Bind `mouse-yank-at-click' to mouse-2.
|
||||
|
||||
+++
|
||||
*** Support for X cut buffers has been removed.
|
||||
|
||||
*** Support for X clipboard managers has been added.
|
||||
|
|
@ -475,7 +492,7 @@ $ESHELL nor variable `explicit-shell-file-name' is set.
|
|||
|
||||
** MH-E
|
||||
|
||||
*** Upgraded to MH-E version 8.2.90. See MH-E-NEWS for details.
|
||||
*** Upgraded to MH-E version 8.2.91. See MH-E-NEWS for details.
|
||||
|
||||
** comint and modes derived from it use the generic completion code.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,41 @@
|
|||
2011-07-12 Johan Bockgård <bojohan@gnu.org>
|
||||
|
||||
* progmodes/compile.el (compilation-error-regexp-alist-alist):
|
||||
Fix previous fix (bug#2490).
|
||||
|
||||
2011-07-12 Roland Winkler <winkler@gnu.org>
|
||||
|
||||
* textmodes/bibtex.el (bibtex-initialize): Use
|
||||
pop-to-buffer-same-window.
|
||||
(bibtex-search-entries): Fix interactive call.
|
||||
|
||||
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* progmodes/compile.el (compilation-error-regexp-alist-alist):
|
||||
Fontise bytecomp Error lines more correctly (bug#2490). Fix
|
||||
suggested by Johan Bockgård.
|
||||
|
||||
* subr.el (remove-duplicates): Remove; `delete-dups' is sufficient.
|
||||
|
||||
* dired-x.el (dired-guess-default): Use `delete-dups'.
|
||||
|
||||
2011-07-12 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* dired.el (dired-mark-prompt):
|
||||
* dired-aux.el (dired-read-shell-command): Doc fix.
|
||||
|
||||
2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* mail/sendmail.el (sendmail-query-once): Use
|
||||
`customize-save-variable' unconditionally, now that it works under
|
||||
emacs -Q.
|
||||
|
||||
* mail/smtpmail.el (smtpmail-query-smtp-server): Ditto.
|
||||
|
||||
* cus-edit.el (custom-file): Take an optional no-error variable.
|
||||
(customize-save-variable): Set the variable, and give a warning if
|
||||
running under "emacs -q".
|
||||
|
||||
2011-07-11 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* loadhist.el (unload-feature-special-hooks):
|
||||
|
|
|
|||
|
|
@ -1033,7 +1033,11 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
|
|||
(put variable 'saved-variable-comment comment)))
|
||||
(put variable 'customized-value nil)
|
||||
(put variable 'customized-variable-comment nil)
|
||||
(custom-save-all)
|
||||
(if (custom-file t)
|
||||
(custom-save-all)
|
||||
(message "Setting `%s' temporarily since \"emacs -q\" would overwrite customizations"
|
||||
variable)
|
||||
(set variable value))
|
||||
value)
|
||||
|
||||
;; Some parts of Emacs might prompt the user to save customizations,
|
||||
|
|
@ -4403,23 +4407,27 @@ Click on \"More\" \(or position point there and press RETURN)
|
|||
if only the first line of the docstring is shown."))
|
||||
:group 'customize)
|
||||
|
||||
(defun custom-file ()
|
||||
(defun custom-file (&optional no-error)
|
||||
"Return the file name for saving customizations."
|
||||
(file-chase-links
|
||||
(or custom-file
|
||||
(let ((user-init-file user-init-file)
|
||||
(default-init-file
|
||||
(if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
|
||||
(when (null user-init-file)
|
||||
(if (or (file-exists-p default-init-file)
|
||||
(and (eq system-type 'windows-nt)
|
||||
(file-exists-p "~/_emacs")))
|
||||
;; Started with -q, i.e. the file containing
|
||||
;; Custom settings hasn't been read. Saving
|
||||
;; settings there would overwrite other settings.
|
||||
(error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
|
||||
(setq user-init-file default-init-file))
|
||||
user-init-file))))
|
||||
(let ((file
|
||||
(or custom-file
|
||||
(let ((user-init-file user-init-file)
|
||||
(default-init-file
|
||||
(if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
|
||||
(when (null user-init-file)
|
||||
(if (or (file-exists-p default-init-file)
|
||||
(and (eq system-type 'windows-nt)
|
||||
(file-exists-p "~/_emacs")))
|
||||
;; Started with -q, i.e. the file containing
|
||||
;; Custom settings hasn't been read. Saving
|
||||
;; settings there would overwrite other settings.
|
||||
(if no-error
|
||||
nil
|
||||
(error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
|
||||
(setq user-init-file default-init-file)))
|
||||
user-init-file))))
|
||||
(and file
|
||||
(file-chase-links file))))
|
||||
|
||||
;; If recentf-mode is non-nil, this is defined.
|
||||
(declare-function recentf-expand-file-name "recentf" (name))
|
||||
|
|
|
|||
|
|
@ -514,22 +514,25 @@ to the end of the list of defaults just after the default value."
|
|||
|
||||
;; This is an extra function so that you can redefine it, e.g., to use gmhist.
|
||||
(defun dired-read-shell-command (prompt arg files)
|
||||
"Read a dired shell command prompting with PROMPT.
|
||||
Passes the prefix argument ARG to `dired-mark-prompt', so that it
|
||||
can be used in the prompt to indicate which FILES are affected.
|
||||
Normally reads the command with `read-shell-command', but if the
|
||||
`dired-x' packages is loaded, uses `dired-guess-shell-command' to offer
|
||||
a smarter default choice of shell command."
|
||||
"Read a dired shell command.
|
||||
PROMPT should be a format string with one \"%s\" format sequence,
|
||||
which is replaced by the value returned by `dired-mark-prompt',
|
||||
with ARG and FILES as its arguments. FILES should be a list of
|
||||
file names. The result is used as the prompt.
|
||||
|
||||
This normally reads using `read-shell-command', but if the
|
||||
`dired-x' package is loaded, use `dired-guess-shell-command' to
|
||||
offer a smarter default choice of shell command."
|
||||
(minibuffer-with-setup-hook
|
||||
(lambda ()
|
||||
(set (make-local-variable 'minibuffer-default-add-function)
|
||||
'minibuffer-default-add-dired-shell-commands))
|
||||
(setq prompt (format prompt (dired-mark-prompt arg files)))
|
||||
(if (featurep 'dired-x)
|
||||
(if (functionp 'dired-guess-shell-command)
|
||||
(dired-mark-pop-up nil 'shell files
|
||||
#'dired-guess-shell-command prompt files)
|
||||
'dired-guess-shell-command prompt files)
|
||||
(dired-mark-pop-up nil 'shell files
|
||||
#'read-shell-command prompt nil nil))))
|
||||
'read-shell-command prompt nil nil))))
|
||||
|
||||
;;;###autoload
|
||||
(defun dired-do-async-shell-command (command &optional arg file-list)
|
||||
|
|
|
|||
|
|
@ -1103,7 +1103,7 @@ See `dired-guess-shell-alist-user'."
|
|||
;; Return commands or nil if flist is still non-nil.
|
||||
;; Evaluate the commands in order that any logical testing will be done.
|
||||
(if (cdr cmds)
|
||||
(remove-duplicates (mapcar #'eval cmds))
|
||||
(delete-dups (mapcar #'eval cmds))
|
||||
(eval (car cmds))))) ; single command
|
||||
|
||||
(defun dired-guess-shell-command (prompt files)
|
||||
|
|
|
|||
|
|
@ -2831,8 +2831,12 @@ also offers to kill buffers visiting deleted files and directories."
|
|||
(if (= 1 count) "" "s"))
|
||||
|
||||
(defun dired-mark-prompt (arg files)
|
||||
"Return a string for use in a prompt, either the current file
|
||||
name, or the marker and a count of marked files."
|
||||
"Return a string suitable for use in a Dired prompt.
|
||||
ARG is normally the prefix argument for the calling command.
|
||||
FILES should be a list of file names.
|
||||
|
||||
The return value has a form like \"foo.txt\", \"[next 3 files]\",
|
||||
or \"* [3 files]\"."
|
||||
;; distinguish-one-marked can cause the first element to be just t.
|
||||
(if (eq (car files) t) (setq files (cdr files)))
|
||||
(let ((count (length files)))
|
||||
|
|
@ -3643,7 +3647,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
|
|||
;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
|
||||
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
|
||||
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
|
||||
;;;;;; dired-diff) "dired-aux" "dired-aux.el" "198ca311b49f0b6354f915502bba4ab6")
|
||||
;;;;;; dired-diff) "dired-aux" "dired-aux.el" "ab62f310329f404f96a29e4f0ab8df73")
|
||||
;;; Generated autoloads from dired-aux.el
|
||||
|
||||
(autoload 'dired-diff "dired-aux" "\
|
||||
|
|
@ -4104,7 +4108,7 @@ instead.
|
|||
;;;***
|
||||
|
||||
;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
|
||||
;;;;;; "dired-x" "dired-x.el" "90459fb5998296fc67986945701b2bfc")
|
||||
;;;;;; "dired-x" "dired-x.el" "219648338c42c7912fa336680b434db0")
|
||||
;;; Generated autoloads from dired-x.el
|
||||
|
||||
(autoload 'dired-jump "dired-x" "\
|
||||
|
|
|
|||
|
|
@ -159,8 +159,6 @@ This is used by the default mail-sending commands. See also
|
|||
(defvar sendmail-query-once-function 'query
|
||||
"Either a function to send email, or the symbol `query'.")
|
||||
|
||||
(autoload 'custom-file "cus-edit")
|
||||
|
||||
;;;###autoload
|
||||
(defun sendmail-query-once ()
|
||||
"Send an email via `sendmail-query-once-function'.
|
||||
|
|
@ -198,9 +196,7 @@ function to use, and then save that choice."
|
|||
'smtpmail-send-it
|
||||
default))
|
||||
(kill-buffer (current-buffer))))))
|
||||
(if (ignore-errors (custom-file))
|
||||
(customize-save-variable 'sendmail-query-once-function function)
|
||||
(setq sendmail-query-once-function function))))
|
||||
(customize-save-variable 'sendmail-query-once-function function)))
|
||||
(funcall sendmail-query-once-function))
|
||||
|
||||
;;;###autoload
|
||||
|
|
|
|||
|
|
@ -587,8 +587,6 @@ The list is in preference order.")
|
|||
(defun smtpmail-response-text (response)
|
||||
(mapconcat 'identity (cdr response) "\n"))
|
||||
|
||||
(autoload 'custom-file "cus-edit")
|
||||
|
||||
(defun smtpmail-query-smtp-server ()
|
||||
(let ((server (read-string "Outgoing SMTP mail server: "))
|
||||
(ports '(587 "smtp"))
|
||||
|
|
@ -600,12 +598,8 @@ The list is in preference order.")
|
|||
(setq port (pop ports)))
|
||||
(when (setq stream (ignore-errors
|
||||
(open-network-stream "smtp" nil server port)))
|
||||
(if (ignore-errors (custom-file))
|
||||
(progn
|
||||
(customize-save-variable 'smtpmail-smtp-server server)
|
||||
(customize-save-variable 'smtpmail-smtp-service port))
|
||||
(setq smtpmail-smtp-server server
|
||||
smtpmail-smtp-service port))
|
||||
(customize-save-variable 'smtpmail-smtp-server server)
|
||||
(customize-save-variable 'smtpmail-smtp-service port)
|
||||
(delete-process stream)))
|
||||
(unless smtpmail-smtp-server
|
||||
(error "Couldn't contact an SMTP server"))))
|
||||
|
|
|
|||
|
|
@ -1,3 +1,23 @@
|
|||
2011-07-12 Bill Wohler <wohler@newt.com>
|
||||
|
||||
Release MH-E version 8.2.91.
|
||||
|
||||
* mh-e.el (Version, mh-version): Update for release 8.2.91.
|
||||
|
||||
* mh-compat.el (mh-pop-to-buffer-same-window): Add compatibility
|
||||
function to call switch-to-buffer on systems that lack
|
||||
pop-to-buffer-same-window.
|
||||
* mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)
|
||||
(mh-make-folder): Call mh-pop-to-buffer-same-window instead of
|
||||
switch-to-buffer. The previous change which used pop-to-buffer
|
||||
produced the wrong behavior.
|
||||
|
||||
2011-07-12 Henrique Martins <henrique@martins.cc> (tiny change)
|
||||
|
||||
* mh-xface.el (mh-picon-get-image): Remove quote from block
|
||||
argument.
|
||||
* mh-mime.el (mh-mh-directive-present-p): Ditto.
|
||||
|
||||
2011-07-10 Bill Wohler <wohler@newt.com>
|
||||
|
||||
Release MH-E version 8.2.90.
|
||||
|
|
|
|||
|
|
@ -122,16 +122,6 @@ introduced in Emacs 22."
|
|||
"XEmacs does not have `font-lock-add-keywords'.
|
||||
This function returns nil on that system.")
|
||||
|
||||
(defun-mh mh-window-full-height-p
|
||||
window-full-height-p (&optional WINDOW)
|
||||
"Return non-nil if WINDOW is not the result of a vertical split.
|
||||
This function is defined in XEmacs as it lacks
|
||||
`window-full-height-p'. The values of the functions
|
||||
`window-height' and `frame-height' are compared instead. The
|
||||
argument WINDOW is ignored."
|
||||
(= (1+ (window-height))
|
||||
(frame-height)))
|
||||
|
||||
(defun-mh mh-image-load-path-for-library
|
||||
image-load-path-for-library (library image &optional path no-error)
|
||||
"Return a suitable search path for images used by LIBRARY.
|
||||
|
|
@ -261,6 +251,18 @@ The argument STRING is ignored."
|
|||
(buffer-substring-no-properties
|
||||
(match-beginning num) (match-end num)))
|
||||
|
||||
(defun-mh mh-pop-to-buffer-same-window
|
||||
pop-to-buffer-same-window (&optional buffer-or-name norecord label)
|
||||
"Pop to buffer specified by BUFFER-OR-NAME in the selected window.
|
||||
Another window will be used only if the buffer can't be shown in
|
||||
the selected window, usually because it is dedicated to another
|
||||
buffer. Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are
|
||||
as for `pop-to-buffer'. This macro is used by Emacs versions that
|
||||
lack the `pop-to-buffer-same-window' function, introduced in
|
||||
Emacs 24. The function `switch-to-buffer' is used instead and
|
||||
LABEL is ignored."
|
||||
(switch-to-buffer buffer-or-name norecord))
|
||||
|
||||
(defun-mh mh-replace-regexp-in-string replace-regexp-in-string
|
||||
(regexp rep string &optional fixedcase literal subexp start)
|
||||
"Replace REGEXP with REP everywhere in STRING and return result.
|
||||
|
|
@ -312,6 +314,16 @@ The arguments RETURN-TO and EXIT-ACTION are ignored."
|
|||
(if exit-action nil)
|
||||
(view-mode 1))
|
||||
|
||||
(defun-mh mh-window-full-height-p
|
||||
window-full-height-p (&optional WINDOW)
|
||||
"Return non-nil if WINDOW is not the result of a vertical split.
|
||||
This function is defined in XEmacs as it lacks
|
||||
`window-full-height-p'. The values of the functions
|
||||
`window-height' and `frame-height' are compared instead. The
|
||||
argument WINDOW is ignored."
|
||||
(= (1+ (window-height))
|
||||
(frame-height)))
|
||||
|
||||
(defmacro mh-write-file-functions ()
|
||||
"Return `write-file-functions' if it exists.
|
||||
Otherwise return `local-write-file-hooks'.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
;; Author: Bill Wohler <wohler@newt.com>
|
||||
;; Maintainer: Bill Wohler <wohler@newt.com>
|
||||
;; Version: 8.2.90
|
||||
;; Version: 8.2.91
|
||||
;; Keywords: mail
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
;; Try to keep variables local to a single file. Provide accessors if
|
||||
;; variables are shared. Use this section as a last resort.
|
||||
|
||||
(defconst mh-version "8.2.90" "Version number of MH-E.")
|
||||
(defconst mh-version "8.2.91" "Version number of MH-E.")
|
||||
|
||||
;; Variants
|
||||
|
||||
|
|
|
|||
|
|
@ -795,7 +795,7 @@ instead."
|
|||
(setq threading-needed-flag mh-show-threads-flag)
|
||||
(setq mh-previous-window-config config))
|
||||
((not (eq (current-buffer) (get-buffer folder)))
|
||||
(pop-to-buffer folder)
|
||||
(mh-pop-to-buffer-same-window folder)
|
||||
(setq mh-previous-window-config config))))
|
||||
(mh-get-new-mail file)
|
||||
(when (and threading-needed-flag
|
||||
|
|
@ -855,7 +855,7 @@ From a program, edit MESSAGE; nil means edit current message."
|
|||
|
||||
;; Just show the edit buffer...
|
||||
(delete-other-windows)
|
||||
(pop-to-buffer edit-buffer)))
|
||||
(mh-pop-to-buffer-same-window edit-buffer)))
|
||||
|
||||
;;;###mh-autoload
|
||||
(defun mh-next-button (&optional backward-flag)
|
||||
|
|
@ -1705,7 +1705,7 @@ DONT-EXEC-PENDING is non-nil."
|
|||
(unless dont-exec-pending
|
||||
(mh-process-or-undo-commands folder)
|
||||
(mh-reset-threads-and-narrowing))
|
||||
(pop-to-buffer folder)))
|
||||
(mh-pop-to-buffer-same-window folder)))
|
||||
(mh-regenerate-headers range)
|
||||
(if (zerop (buffer-size))
|
||||
(if (equal range "all")
|
||||
|
|
@ -1786,7 +1786,7 @@ Also removes all content from the folder buffer."
|
|||
(defun mh-make-folder (name)
|
||||
"Create a new mail folder called NAME.
|
||||
Make it the current folder."
|
||||
(pop-to-buffer name)
|
||||
(mh-pop-to-buffer-same-window name)
|
||||
(setq buffer-read-only nil)
|
||||
(erase-buffer)
|
||||
(if mh-adaptive-cmd-note-flag
|
||||
|
|
|
|||
|
|
@ -1690,19 +1690,19 @@ buffer, while END defaults to the end of the buffer."
|
|||
(unless begin (setq begin (point-min)))
|
||||
(unless end (setq end (point-max)))
|
||||
(save-excursion
|
||||
(block 'search-for-mh-directive
|
||||
(block search-for-mh-directive
|
||||
(goto-char begin)
|
||||
(while (re-search-forward "^#" end t)
|
||||
(let ((s (buffer-substring-no-properties
|
||||
(point) (mh-line-end-position))))
|
||||
(cond ((equal s ""))
|
||||
((string-match "^forw[ \t\n]+" s)
|
||||
(return-from 'search-for-mh-directive t))
|
||||
(return-from search-for-mh-directive t))
|
||||
(t (let ((first-token (car (split-string s "[ \t;@]"))))
|
||||
(when (and first-token
|
||||
(string-match mh-media-type-regexp
|
||||
first-token))
|
||||
(return-from 'search-for-mh-directive t)))))))
|
||||
(return-from search-for-mh-directive t)))))))
|
||||
nil)))
|
||||
|
||||
(defun mh-minibuffer-read-type (filename &optional default)
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ The directories are searched for in the order they appear in the list.")
|
|||
(cond (cached-value (return-from mh-picon-get-image cached-value))
|
||||
((not host-list) (return-from mh-picon-get-image nil)))
|
||||
(setq match
|
||||
(block 'loop
|
||||
(block loop
|
||||
;; u@h search
|
||||
(loop for dir in mh-picon-existing-directory-list
|
||||
do (loop for type in mh-picon-image-types
|
||||
|
|
@ -215,15 +215,15 @@ The directories are searched for in the order they appear in the list.")
|
|||
for file1 = (format "%s/%s.%s"
|
||||
dir canonical-address type)
|
||||
when (file-exists-p file1)
|
||||
do (return-from 'loop file1)
|
||||
do (return-from loop file1)
|
||||
;; [path]user
|
||||
for file2 = (format "%s/%s.%s" dir user type)
|
||||
when (file-exists-p file2)
|
||||
do (return-from 'loop file2)
|
||||
do (return-from loop file2)
|
||||
;; [path]host
|
||||
for file3 = (format "%s/%s.%s" dir host type)
|
||||
when (file-exists-p file3)
|
||||
do (return-from 'loop file3)))
|
||||
do (return-from loop file3)))
|
||||
;; facedb search
|
||||
;; Search order for user@foo.net:
|
||||
;; [path]net/foo/user
|
||||
|
|
@ -241,11 +241,11 @@ The directories are searched for in the order they appear in the list.")
|
|||
do (loop for type in mh-picon-image-types
|
||||
for z1 = (format "%s.%s" y type)
|
||||
when (file-exists-p z1)
|
||||
do (return-from 'loop z1)
|
||||
do (return-from loop z1)
|
||||
for z2 = (format "%s/face.%s"
|
||||
y type)
|
||||
when (file-exists-p z2)
|
||||
do (return-from 'loop z2)))))))
|
||||
do (return-from loop z2)))))))
|
||||
(setf (gethash canonical-address mh-picon-cache)
|
||||
(mh-picon-file-contents match)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
|
|||
\\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
|
||||
\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
|
||||
*\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
|
||||
\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
|
||||
*[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
|
||||
1 (2 . 4) (3 . 5) (6 . 7))
|
||||
|
||||
(lcc
|
||||
|
|
|
|||
11
lisp/subr.el
11
lisp/subr.el
|
|
@ -173,7 +173,7 @@ value of last one, or nil if there are none.
|
|||
(progn
|
||||
;; If we reload subr.el after having loaded CL, be careful not to
|
||||
;; overwrite CL's extended definition of `dolist', `dotimes',
|
||||
;; `declare', `push', `pop' and `remove-duplicates'.
|
||||
;; `declare', `push' and `pop'.
|
||||
|
||||
(defmacro dolist (spec &rest body)
|
||||
"Loop over a list.
|
||||
|
|
@ -250,15 +250,6 @@ the return value (nil if RESULT is omitted).
|
|||
Treated as a declaration when used at the right place in a
|
||||
`defmacro' form. \(See Info anchor `(elisp)Definition of declare'.)"
|
||||
nil)
|
||||
|
||||
(defun remove-duplicates (list)
|
||||
"Return a copy of LIST with all duplicate elements removed."
|
||||
(let ((result nil))
|
||||
(while list
|
||||
(unless (member (car list) result)
|
||||
(push (car list) result))
|
||||
(pop list))
|
||||
(nreverse result)))
|
||||
))
|
||||
|
||||
(defmacro ignore-errors (&rest body)
|
||||
|
|
|
|||
|
|
@ -3060,7 +3060,7 @@ When called interactively, FORCE is t, CURRENT is t if current buffer uses
|
|||
;; select BibTeX buffer
|
||||
(if select
|
||||
(if buffer-list
|
||||
(switch-to-buffer
|
||||
(pop-to-buffer-same-window
|
||||
(completing-read "Switch to BibTeX buffer: "
|
||||
(mapcar 'buffer-name buffer-list)
|
||||
nil t
|
||||
|
|
@ -5179,7 +5179,7 @@ where FILE is the BibTeX file of ENTRY."
|
|||
(delete-dups
|
||||
(apply 'append
|
||||
bibtex-user-optional-fields
|
||||
(mapcar (lambda (x) (mapcar 'car (apply 'append (cdr x))))
|
||||
(mapcar (lambda (x) (mapcar 'car (apply 'append (nthcdr 2 x))))
|
||||
bibtex-entry-alist))) nil t)
|
||||
(read-string "Regexp: ")
|
||||
(if bibtex-search-entry-globally
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
Without this fix, (bitmap-spec-p '(34359738368 1 "x"))
|
||||
would wrongly return t on a 64-bit host.
|
||||
|
||||
2011-07-11 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* dispnew.c (init_display): Use *_RANGE_OVERFLOW macros.
|
||||
The plain *_OVERFLOW macros run afoul of GCC bug 49705
|
||||
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49705>
|
||||
|
|
@ -164,6 +162,18 @@
|
|||
Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally
|
||||
well either way, and we prefer signed to unsigned.
|
||||
|
||||
2011-07-12 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix minor new problems caught by GCC 4.6.1.
|
||||
* term.c (init_tty): Remove unused local.
|
||||
* xsettings.c (store_monospaced_changed): Define this function only
|
||||
if (defined HAVE_GSETTINGS || defined HAVE_GCONF), as it's
|
||||
not used otherwise.
|
||||
|
||||
2011-07-12 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* xdisp.c (Vresize_mini_windows): Minor doc fix (Bug#3300).
|
||||
|
||||
2011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* xdisp.c (syms_of_xdisp): Make it explicit that the mini-windows
|
||||
|
|
|
|||
|
|
@ -3097,7 +3097,6 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
|
|||
char *area = NULL;
|
||||
char **address = &area;
|
||||
int buffer_size = 4096;
|
||||
register char *p = NULL;
|
||||
int status;
|
||||
struct tty_display_info *tty = NULL;
|
||||
struct terminal *terminal = NULL;
|
||||
|
|
|
|||
|
|
@ -26852,12 +26852,12 @@ If an integer, it specifies a number of lines. */);
|
|||
Vmax_mini_window_height = make_float (0.25);
|
||||
|
||||
DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows,
|
||||
doc: /* *How to resize mini-windows (the minibuffer and the echo area).
|
||||
doc: /* How to resize mini-windows (the minibuffer and the echo area).
|
||||
A value of nil means don't automatically resize mini-windows.
|
||||
A value of t means resize them to fit the text displayed in them.
|
||||
A value of `grow-only', the default, means let mini-windows grow
|
||||
only, until their display becomes empty, at which point the windows
|
||||
go back to their normal size. */);
|
||||
A value of `grow-only', the default, means let mini-windows grow only;
|
||||
they return to their normal size when the minibuffer is closed, or the
|
||||
echo area becomes empty. */);
|
||||
Vresize_mini_windows = Qgrow_only;
|
||||
|
||||
DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ dpyinfo_valid (struct x_display_info *dpyinfo)
|
|||
|
||||
/* Store a monospace font change event if the monospaced font changed. */
|
||||
|
||||
#ifdef HAVE_XFT
|
||||
#if defined HAVE_XFT && (defined HAVE_GSETTINGS || defined HAVE_GCONF)
|
||||
static void
|
||||
store_monospaced_changed (const char *newfont)
|
||||
{
|
||||
|
|
@ -99,9 +99,11 @@ store_monospaced_changed (const char *newfont)
|
|||
XCAR (first_dpyinfo->name_list_element));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Store a font name change event if the font name changed. */
|
||||
|
||||
#ifdef HAVE_XFT
|
||||
static void
|
||||
store_font_name_changed (const char *newfont)
|
||||
{
|
||||
|
|
@ -252,7 +254,7 @@ something_changed_gsettingsCB (GSettings *settings,
|
|||
g_variant_unref (val);
|
||||
}
|
||||
}
|
||||
#endif /* HAVE_XFT */
|
||||
#endif /* HAVE_XFT */
|
||||
}
|
||||
|
||||
#endif /* HAVE_GSETTINGS */
|
||||
|
|
@ -441,14 +443,14 @@ parse_settings (unsigned char *prop,
|
|||
bytes_parsed += 4; /* Skip serial for this value */
|
||||
if (bytes_parsed > bytes) return BadLength;
|
||||
|
||||
want_this =
|
||||
want_this =
|
||||
#ifdef HAVE_XFT
|
||||
(nlen > 6 && strncmp (name, "Xft/", 4) == 0)
|
||||
|| strcmp (XSETTINGS_FONT_NAME, name) == 0
|
||||
||
|
||||
#endif
|
||||
strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0;
|
||||
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case 0: /* Integer */
|
||||
|
|
|
|||
Loading…
Reference in a new issue