3 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 589e482..e662010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ figlet (2.2.5-3) UNRELEASED; urgency=low
     libconfig-model-dpkg-perl
   * debian/patches: Fix FTCBFS by defaulting LD to $(CC) (closes: #852785)
     - Thanks to Helmut Grohne <helmut@subdivi.de> for the patch
+  * debian/figlet.el: apply multiple patches from Kevin Ryde
+    <user42_kevin@yahoo.com.au> (closes: #807293, #807296, #807295)
   * debian/rules: add hardening=+all to DEB_BUILD_MAINT_OPTIONS
 
  -- Jonathan McCrohan <jmccrohan@gmail.com>  Tue, 18 Dec 2012 22:44:16 +0000
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
new file mode 100644
index 0000000..5e1da10
--- /dev/null
+++ b/debian/emacsen-startup
@@ -0,0 +1,7 @@
+;;; 50figlet.el -- debian emacs setups for figlet
+
+(if (not (file-exists-p "/usr/share/emacs/site-lisp/figlet.el"))
+    (message "figlet removed but not purged, skipping setup")
+
+  (autoload 'figlet-message "figlet"
+    "Inserts large message of text in ASCII font into current buffer" t))
diff --git a/debian/figlet.el b/debian/figlet.el
index c9e0ae6..a59e4df 100644
--- a/debian/figlet.el
+++ b/debian/figlet.el
@@ -39,12 +39,18 @@
 
 (defun figlet-message ()
   "Inserts large message of text in ASCII font into current buffer"
-  (interactive)
+  (interactive "*")
   (setq str (read-from-minibuffer "Enter message: "))
   (setq font
         (completing-read "Which font: " fig-font-list nil t))
-  (call-process "figlet" nil t t "-f" font fig-options str)
+  ;; If the user enters nothing then font is empty string "".
+  ;; Omit the -f option in that case, giving figlet's default font.
+  (let ((args (append (and (not (equal font "")) (list "-f" font))
+                      (list fig-options str))))
+    (apply 'call-process "figlet" nil t t args))
   (message "Done printing"))
 
 
 (setq max-lisp-eval-depth save-eval-depth)
+
+(provide 'figlet)