From c5847bc02aa02f0c781f47ea4d50616fdd53aa08 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 2 May 2015 17:23:34 +0200
Subject: Fix some warnings

---
 emacs/.emacs.d/init.el | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index ba7f2d4..1afb7bb 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -19,7 +19,12 @@
   (require 'esh-proc)
   (require 'fill-column-indicator)
   (require 'magit)
-  (require 'yasnippet))
+  (require 'yasnippet)
+  (require 'ispell)
+  (require 'eww)
+  (require 'php-mode)
+  (require 'slime)
+  (require 'smex))
 
 (load (concat user-emacs-directory "init2"))
 
@@ -165,7 +170,7 @@ MODE1 is enabled and vice-versa."
   "Send COMMAND through awesome-client to awesome."
   (shell-command (format "echo '%s' | awesome-client" command)))
 
-(defun awesome-update-mailbox (gnus-group)
+(defun awesome-update-mailbox (_gnus-group)
   "Update mailcount widget for GNUS-GROUP.
 
 But only if it is a maildir inbox."
@@ -246,7 +251,7 @@ But only if it is a maildir inbox."
 
 (defun oni:eshell-prompt ()
   "Show a pretty shell prompt."
-  (concat (if (not (looking-back "\n")) "\n")
+  (concat (if (not (looking-back "\n" nil)) "\n")
           (oni:shorten-dir (abbreviate-file-name (eshell/pwd)))
           " > "))
 
@@ -276,7 +281,7 @@ But only if it is a maildir inbox."
   (condition-case err
       (call-interactively #'delete-char)
     (error (if (and (eq (car err) 'end-of-buffer)
-                    (looking-back eshell-prompt-regexp))
+                    (looking-back eshell-prompt-regexp nil))
                (kill-buffer)
              (signal (car err) (cdr err))))))
 
@@ -659,8 +664,8 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
                      (interactive)
                      (if (outline-on-heading-p)
                          (if (outline-invisible-p (line-end-position))
-                             (show-entry)
-                           (hide-entry))
+                             (outline-show-entry)
+                           (outline-hide-entry))
                        (call-interactively func))))))
 
 (defun oni:current-conkeror-tab (httpcon)
@@ -687,7 +692,7 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
     (add-hook 'after-make-frame-functions
               (lambda (frame)
                 (cl-letf (((symbol-function 'display-graphic-p)
-                           (lambda (&optional display) t)))
+                           (lambda (&optional _) t)))
                   (oni:set-theme frame))))
   (oni:eval-after-init (oni:set-theme nil)))
 
@@ -798,7 +803,7 @@ If no direction is given, don't split."
         (outline-hide-entry))))
 
 (defun multiplication-table (number &optional upto)
-  ""
+  "Print a multiplication table of NUMBER up to UPTO."
   (interactive "nMultiplication table for: \nP")
   (let ((upto (or upto 10))
         (buffer (get-buffer-create "*Multiplication*")))
@@ -1076,7 +1081,7 @@ from myaethon2.core.decorators import (
   (evil-declare-key 'normal outline-minor-mode-map (kbd "TAB") #'oni:outline-toggle-entry))
 
 (stante-after eww
-  (setq eww-download-path               ; Don't go to ~/Downloads
+  (setq eww-download-directory          ; Don't go to ~/Downloads
         "~/downloads/"))
 
 (stante-after files
@@ -1191,7 +1196,6 @@ from myaethon2.core.decorators import (
 
 (stante-after php-mode
   (setq-default php-mode-warn-if-mumamo-off nil)
-  (setq php-function-call-face 'font-lock-function-name-face)
   (setq php-mode-force-pear t))
 
 (stante-after prodigy
@@ -1252,7 +1256,6 @@ from myaethon2.core.decorators import (
         slime-default-lisp 'sbcl))
 
 (stante-after smex
-  (setq smex-key-advice-ignore-menu-bar t)
   (setq smex-save-file "~/.emacs.d/smex-items"))
 
 (stante-after "startup"
@@ -1497,14 +1500,14 @@ from myaethon2.core.decorators import (
 
   (evil-mode)
   (kill-local-variable 'mode-line-format)
-  (when (string-equal system-name "drd")
+  (when (string-equal (system-name) "drd")
     (require 'colemak-evil))
   (global-evil-surround-mode))
 
 (with-eval-after-load 'ruby
   (global-rinari-mode))
 
-(when (equal system-name "drd")
+(when (equal (system-name) "drd")
   (load "eap-autoloads"))
 
 (auto-insert-mode)
@@ -1518,7 +1521,7 @@ from myaethon2.core.decorators import (
 (help-at-pt-set-timer)
 (windmove-default-keybindings)
 
-(load system-name :noerror)
+(load (system-name) :noerror)
 
 (setq magit-last-seen-setup-instructions "1.4.0")
 
-- 
cgit v1.2.3-54-g00ecf