projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplications go on.
[apps/madmutt.git]
/
help.c
diff --git
a/help.c
b/help.c
index
abccfac
..
a7b8c9f
100644
(file)
--- a/
help.c
+++ b/
help.c
@@
-14,13
+14,14
@@
#endif
#include <lib-lib/macros.h>
#endif
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include <lib-lib/str.h>
#include <lib-lib/str.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "pager.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "pager.h"
-#include "mapping.h"
#include <wchar.h>
#include <ctype.h>
#include <wchar.h>
#include <ctype.h>
@@
-88,8
+89,8
@@
static int print_macro (FILE * f, int maxwidth, const char **macro)
size_t len = m_strlen(*macro);
mbstate_t mbstate1, mbstate2;
size_t len = m_strlen(*macro);
mbstate_t mbstate1, mbstate2;
-
memset (&mbstate1, 0, sizeof (mbstate1)
);
-
memset (&mbstate2, 0, sizeof (mbstate2)
);
+
p_clear(&mbstate1, 1
);
+
p_clear(&mbstate2, 1
);
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
if (k == (size_t) (-1) || k == (size_t) (-2)) {
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
if (k == (size_t) (-1) || k == (size_t) (-2)) {
@@
-172,7
+173,7
@@
static void format_line (FILE * f, int ismacro,
}
if (ismacro > 0) {
}
if (ismacro > 0) {
- if (!
str_cmp
(Pager, "builtin"))
+ if (!
m_strcmp
(Pager, "builtin"))
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
@@
-199,7
+200,7
@@
static void format_line (FILE * f, int ismacro,
n = COLS - col;
if (ismacro >= 0) {
n = COLS - col;
if (ismacro >= 0) {
-
SKIPWS
(t3);
+
t3 = vskipspaces
(t3);
/* FIXME: this is completely wrong */
if ((n = m_strlen(t3)) > COLS - col) {
/* FIXME: this is completely wrong */
if ((n = m_strlen(t3)) > COLS - col) {
@@
-213,7
+214,7
@@
static void format_line (FILE * f, int ismacro,
print_macro (f, n, &t3);
if (*t3) {
print_macro (f, n, &t3);
if (*t3) {
- if (
str_cmp
(Pager, "builtin")) {
+ if (
m_strcmp
(Pager, "builtin")) {
fputc ('\n', f);
n = 0;
}
fputc ('\n', f);
n = 0;
}