* cosmetics

emacs/mu4e-hdrs.el

@@ -33,17 +33,12 @@
 (require 'mu4e-proc)
 
 ;;;; internal variables/constants ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defvar mu4e-last-expr nil
+(defvar mu4e-last-expr ni "*internal* The most recent search expression.")
-  "*internal* The most recent search expression.")
-
 (defconst mu4e-hdrs-buffer-name "*mu4e-headers*"
   "*internal* Name of the buffer for message headers.")
-
+(defvar mu4e-hdrs-buffer nil "*internal* Buffer for message headers")
-(defvar mu4e-hdrs-buffer nil
+(defconst mu4e-hdrs-fringe " " "*internal* The space on the left of
-  "*internal* Buffer for message headers")
+message headers to put marks.")
-
-(defconst mu4e-hdrs-fringe "  "
-  "*internal* The space on the left of message headers to put marks.")
 
 (defun mu4e-hdrs-clear ()
   "Clear the header buffer and related data structures."
@@ -389,7 +384,7 @@ after the end of the search results."
 		(if width
 		  (truncate-string-to-width field width 0 ?\s t)
 		  field)
-		'face 'mu4e-title-face) " ")))
+		'face 'mu4e-header-title-face) " ")))
 	mu4e-headers-fields))))
 
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

emacs/mu4e-main.el

@@ -1,10 +1,10 @@
-;;; mu4e-main.el -- part of mm, the mu mail user agent
+;;; mu4e-main.el -- part of mu4e, the mu mail user agent
 ;;
 ;; Copyright (C) 2011-2012 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
- 
+
 ;; This file is not part of GNU Emacs.
 ;;
 ;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -26,8 +26,7 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defconst mu4e-main-buffer-name "*mu4e-main*"
-  "*internal* Name of the mm main buffer.")
+  "*internal* Name of the mu4e main view buffer.")
-
 
 (defvar mu4e-main-mode-map
   (let ((map (make-sparse-keymap)))
@@ -86,7 +85,7 @@ clicked."
     newstr))
 
 (defun mu4e-main-view()
-  "Show the mm main view."
+  "Show the mu4e main view."
   (let ((buf (get-buffer-create mu4e-main-buffer-name))
 	 (inhibit-read-only t))
     (with-current-buffer buf

emacs/mu4e-send.el

@@ -1,11 +1,9 @@
-;; mu4e-send.el -- part of mm, the mu mail user agent
+;; mu4e-send.el -- part of mu4e, the mu mail user agent for emacs
 ;;
 ;; Copyright (C) 2011-2012 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Keywords: email
-;; Version: 0.0
 
 ;; This file is not part of GNU Emacs.
 ;;
@@ -27,8 +25,6 @@
 ;; In this file, various functions to compose/send messages, piggybacking on
 ;; gnus' message mode
 
-;; mm
-
 ;;; Code:
 
 (eval-when-compile (require 'cl))
@@ -46,8 +42,8 @@
 
 (defun mu4e-send-user-agent ()
   "Return the User-Agent string for mu4e. This is either the value
-of `mu4e-user-agent', or, if not set, a string based on the version
+of `mu4e-user-agent', or, if not set, a string based on the versions
-of mm and emacs."
+of mu4e and emacs."
   (or mu4e-user-agent
     (format "mu4e %s; emacs %s" mu4e-mu-version emacs-version)))
 

src/mu-msg-file.c

@@ -485,7 +485,8 @@ convert_to_utf8 (GMimePart *part, char *buffer)
 
 	/* of course, the charset specified may be incorrect... */
 	if (charset) {
-		char *utf8 = mu_str_convert_to_utf8 (buffer, charset);
+		char *utf8;
+		utf8 = mu_str_convert_to_utf8 (buffer, charset);
 		if (utf8) {
 			g_free (buffer);
 			return utf8;