diff options
| -rw-r--r-- | lisp/allout.el | 35 | ||||
| -rw-r--r-- | lisp/w32-vars.el | 4 |
2 files changed, 0 insertions, 39 deletions
diff --git a/lisp/allout.el b/lisp/allout.el index af71ea75ce0..26e7f6b56c2 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -1506,41 +1506,6 @@ wrapped within allout's automatic `fill-prefix' setting.") | |||
| 1506 | (make-variable-buffer-local 'allout-outside-normal-auto-fill-function) | 1506 | (make-variable-buffer-local 'allout-outside-normal-auto-fill-function) |
| 1507 | ;;;_ = prevent redundant activation by desktop mode: | 1507 | ;;;_ = prevent redundant activation by desktop mode: |
| 1508 | (add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil)) | 1508 | (add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil)) |
| 1509 | ;;;_ = allout-passphrase-verifier-string | ||
| 1510 | (defvar allout-passphrase-verifier-string nil | ||
| 1511 | "Setting used to test solicited encryption passphrases against the one | ||
| 1512 | already associated with a file. | ||
| 1513 | |||
| 1514 | It consists of an encrypted random string useful only to verify that a | ||
| 1515 | passphrase entered by the user is effective for decryption. The passphrase | ||
| 1516 | itself is *not* recorded in the file anywhere, and the encrypted contents | ||
| 1517 | are random binary characters to avoid exposing greater susceptibility to | ||
| 1518 | search attacks. | ||
| 1519 | |||
| 1520 | The verifier string is retained as an Emacs file variable, as well as in | ||
| 1521 | the Emacs buffer state, if file variable adjustments are enabled. See | ||
| 1522 | `allout-enable-file-variable-adjustment' for details about that.") | ||
| 1523 | (make-variable-buffer-local 'allout-passphrase-verifier-string) | ||
| 1524 | (make-obsolete-variable 'allout-passphrase-verifier-string | ||
| 1525 | "it is no longer used." "23.3") | ||
| 1526 | ;;;###autoload | ||
| 1527 | (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp) | ||
| 1528 | ;;;_ = allout-passphrase-hint-string | ||
| 1529 | (defvar allout-passphrase-hint-string "" | ||
| 1530 | "Variable used to retain reminder string for file's encryption passphrase. | ||
| 1531 | |||
| 1532 | See the description of `allout-passphrase-hint-handling' for details about how | ||
| 1533 | the reminder is deployed. | ||
| 1534 | |||
| 1535 | The hint is retained as an Emacs file variable, as well as in the Emacs buffer | ||
| 1536 | state, if file variable adjustments are enabled. See | ||
| 1537 | `allout-enable-file-variable-adjustment' for details about that.") | ||
| 1538 | (make-variable-buffer-local 'allout-passphrase-hint-string) | ||
| 1539 | (setq-default allout-passphrase-hint-string "") | ||
| 1540 | (make-obsolete-variable 'allout-passphrase-hint-string | ||
| 1541 | "it is no longer used." "23.3") | ||
| 1542 | ;;;###autoload | ||
| 1543 | (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp) | ||
| 1544 | ;;;_ = allout-after-save-decrypt | 1509 | ;;;_ = allout-after-save-decrypt |
| 1545 | (defvar allout-after-save-decrypt nil | 1510 | (defvar allout-after-save-decrypt nil |
| 1546 | "Internal variable, is nil or has the value of two points: | 1511 | "Internal variable, is nil or has the value of two points: |
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 3531b94f15f..44f9b7670db 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el | |||
| @@ -47,10 +47,6 @@ after changing the value of this variable." | |||
| 47 | (setq mouse-appearance-menu-map nil)) | 47 | (setq mouse-appearance-menu-map nil)) |
| 48 | :group 'w32) | 48 | :group 'w32) |
| 49 | 49 | ||
| 50 | (defvar w32-list-proportional-fonts nil | ||
| 51 | "Include proportional fonts in the default font dialog.") | ||
| 52 | (make-obsolete-variable 'w32-list-proportional-fonts "no longer used." "23.1") | ||
| 53 | |||
| 54 | (unless (eq system-type 'cygwin) | 50 | (unless (eq system-type 'cygwin) |
| 55 | (defcustom w32-allow-system-shell nil | 51 | (defcustom w32-allow-system-shell nil |
| 56 | "Disable startup warning when using \"system\" shells." | 52 | "Disable startup warning when using \"system\" shells." |