1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
The Debian packaging of smex is maintained in git, using the merging
workflow described in dgit-maint-merge(7). There isn't a patch queue
that can be represented as a quilt series.
A detailed breakdown of the changes is available from their canonical
representation - git commits in the packaging repository. For
example, to see the changes made by the Debian maintainer in the first
upload of upstream version 1.2.3, you could use:
% git clone https://git.dgit.debian.org/smex
% cd smex
% git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
(If you have dgit, use `dgit clone smex`, rather than plain `git
clone`.)
A single combined diff, containing all the changes, follows.
--- /dev/null
+++ smex-3.0/CHANGELOG
@@ -0,0 +1,29 @@
+### 3.0
+ * Use `execute-extended-command` for running commands.
+ This breaks support for Emacs versions older than 23 and
+ obviates the user option `smex-key-advice-ignore-menu-bar`.
+ (The default Emacs behaviour is to not show menu bar bindings.)
+
+ As a result of this change, the variable `suggest-key-bindings`
+ is now honored when executing commands.
+ * Save command history in `extended-command-history`, like M-x.
+
+### 2.1
+ * Improved tab completion in the Smex minibuffer
+ * Add compatibility with command-frequency
+
+### 2.0
+ * Remove `smex-detect-legacy-save-file`.
+ Only relevant (but a breaking change) when you rely on a long deprecated default
+ value of smex-save-file.
+ * Ignore smex-save-file when it's empty instead of raising an error.
+ Warn on invalid data in smex-save-file. Fixes [issue #23]
+ (https://github.com/nonsequitur/smex/issues/23/).
+
+### 1.1.4
+ * Allow running `where-is` on the selected command.
+ * Fix compatibility with ido-ubiquitous.
+
+### 1.1.3
+ * Add auto-initialization.
+ * Minor fixes.
--- smex-3.0.orig/README.markdown
+++ smex-3.0/README.markdown
@@ -1,24 +1,11 @@
-
-
## Smex
Smex is a M-x enhancement for Emacs. Built on top of Ido, it provides
a convenient interface to your recently and most frequently used
commands. And to all the other commands, too.
-
-
-## [Changelog](#changelog-1)
-Jump to [Changelog](#changelog-1).
-
## Get started
-* Get Smex
- * Via [Marmalade](http://marmalade-repo.org/packages/smex) or
- [MELPA](http://melpa.milkbox.net/).
- * Or manually download Smex and set-up your load path.
- [(Find out more.)](http://www.emacswiki.org/emacs/InstallingPackages)
-
* To auto-start Smex every time you open Emacs add these lines to your .emacs file:
(require 'smex) ; Not needed if you use package.el
@@ -86,38 +73,6 @@ Smex keeps track of.
### Prompt
Set `smex-prompt-string` for a custom prompt.
-## Changelog
-
-### 3.0
- * Use `execute-extended-command` for running commands.
- This breaks support for Emacs versions older than 23 and
- obviates the user option `smex-key-advice-ignore-menu-bar`.
- (The default Emacs behaviour is to not show menu bar bindings.)
-
- As a result of this change, the variable `suggest-key-bindings`
- is now honored when executing commands.
- * Save command history in `extended-command-history`, like M-x.
-
-### 2.1
- * Improved tab completion in the Smex minibuffer
- * Add compatibility with command-frequency
-
-### 2.0
- * Remove `smex-detect-legacy-save-file`.
- Only relevant (but a breaking change) when you rely on a long deprecated default
- value of smex-save-file.
- * Ignore smex-save-file when it's empty instead of raising an error.
- Warn on invalid data in smex-save-file. Fixes [issue #23]
- (https://github.com/nonsequitur/smex/issues/23/).
-
-### 1.1.4
- * Allow running `where-is` on the selected command.
- * Fix compatibility with ido-ubiquitous.
-
-### 1.1.3
- * Add auto-initialization.
- * Minor fixes.
-
## Appendix
Smex is my first venture into Elisp. I'd be glad to receive patches,
--- smex-3.0.orig/smex.el
+++ smex-3.0/smex.el
@@ -240,8 +240,8 @@ Set this to nil to disable fuzzy matchin
(error (if (smex-save-file-not-empty-p)
(error "Invalid data in smex-save-file (%s). Can't restore history."
smex-save-file)
- (if (not (boundp 'smex-history)) (setq smex-history))
- (if (not (boundp 'smex-data)) (setq smex-data))))))
+ (unless (boundp 'smex-history) (setq smex-history nil))
+ (unless (boundp 'smex-data) (setq smex-data nil))))))
(setq smex-history nil smex-data nil))))
(defsubst smex-save-file-not-empty-p ()
|
