Mercurial > emacs
view etc/sex.6 @ 109383:dcdf09a52e2c
[[[
* lisp/bookmark.el (bookmark-bmenu-switch-other-window,
bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
ambient binding of `bookmark-automatically-show-annotations'. (Bug #6515)
]]]
=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2010-04-14 15:07:53 +0000
+++ lisp/bookmark.el 2010-06-27 03:40:14 +0000
@@ -1860,8 +1860,7 @@
(pop-up-windows t))
(delete-other-windows)
(switch-to-buffer (other-buffer))
- (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
- (bookmark--jump-via bmrk 'pop-to-buffer))
+ (bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
@@ -1875,8 +1874,7 @@
"Select this line's bookmark in other window, leaving bookmark menu visible."
(interactive)
(let ((bookmark (bookmark-bmenu-bookmark)))
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
+ (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
(defun bookmark-bmenu-switch-other-window ()
@@ -1887,8 +1885,7 @@
(pop-up-windows t)
same-window-buffer-names
same-window-regexps)
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'display-buffer))))
+ (bookmark--jump-via bookmark 'display-buffer)))
(defun bookmark-bmenu-other-window-with-mouse (event)
"Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
=== modified file 'lisp/saveplace.el'
--- lisp/saveplace.el 2010-01-13 08:35:10 +0000
+++ lisp/saveplace.el 2010-02-07 23:14:52 +0000
@@ -213,7 +213,7 @@
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
- (print save-place-alist (current-buffer)))
+ (pp save-place-alist (current-buffer)))
(let ((version-control
(cond
((null save-place-version-control) nil)
| author | Karl Fogel <kfogel@red-bean.com> |
|---|---|
| date | Tue, 13 Jul 2010 18:09:20 -0400 |
| parents | 4114b11414e4 |
| children |
line wrap: on
line source
SEX(6) EUNUCH Programmer's Manual SEX(6) NAME sex - have sex SYNOPSIS sex [ options ] ... [ username ] ... DESCRIPTION _s_e_x allows the invoker to have sex with the user(s) speci- fied in the command line. If no users are specified, they are taken from the LOVERS environment variable. Options to make things more interesting are as follows: -1 masturbate -a external stimulus (aphrodisiac) option -b buggery -B<animal> bestiality with <animal> -c chocolate sauce option -C chaining option (cuffs included) (see also -m -s -W) -d<file> get a date with the features described in <file> -e exhibitionism (image sent to all machines on the net) -f foreplay option -F nasal sex with plants -i coitus interruptus (messy!) -j jacuzzi option (California sites only) -l leather option -m masochism (see -s) -M triple parallel (Menage a Trois) option -n necrophilia (if target process is not dead, program kills it) -o oral option -O parallel access (orgy) -p debug option (proposition only) -P pedophilia (must specify a child process) Printed 2/15/87 2/15/87 1 SEX(6) EUNUCH Programmer's Manual SEX(6) -q quickie (wham, bam, thank you, ma'am) -s sadism (target must set -m) -S sundae option -T<number> voice-net sex via standard uucp autodialer facilities; area code prefix of 900 is assumed. -v voyeurism (surveys the entire net) -w whipped cream option -W whips (see also -s, -C, and -m) ENVIRONMENT LOVERS is a list of default partners which will be used if none are specified in the command line. If any are specified, the values in LOVERS is ignored. FILES /usr/lib/sex/animals animals for bestiality /usr/lib/sex/blackbook possible dates /usr/lib/sex/sundaes sundae recipes /usr/lib/sex/s+m sado-masochistic equipment BUGS ^C (quit process) may leave the user very unsatisfied. ^Z (stop process) is usually quite messy. MAN AUTHOR Author prefers to be anonymous. HISTORY Oldest program ever.